projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[linux-2.6-block.git]
/
mm
/
cma_debug.c
diff --git
a/mm/cma_debug.c
b/mm/cma_debug.c
index f8e4b60db167215862824637d856ffb34332f071..ffc0c3d0ae64a610409d85a5ac5704c2a660ab0c 100644
(file)
--- a/
mm/cma_debug.c
+++ b/
mm/cma_debug.c
@@
-138,7
+138,7
@@
static int cma_alloc_mem(struct cma *cma, int count)
if (!mem)
return -ENOMEM;
- p = cma_alloc(cma, count, 0);
+ p = cma_alloc(cma, count, 0
, GFP_KERNEL
);
if (!p) {
kfree(mem);
return -ENOMEM;