projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8325330
)
mm-cma-allocation-trigger-fix
author
Andrew Morton
<
[email protected]
>
Tue, 14 Apr 2015 22:45:05 +0000
(15:45 -0700)
committer
Linus Torvalds
<
[email protected]
>
Tue, 14 Apr 2015 23:49:00 +0000
(16:49 -0700)
s/CONFIG_CMA_ALIGNMENT/0/, per Joonsoo
Cc: Joonsoo Kim <
[email protected]
>
Cc: Konrad Rzeszutek Wilk <
[email protected]
>
Cc: Laura Abbott <
[email protected]
>
Cc: Marek Szyprowski <
[email protected]
>
Cc: Sasha Levin <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
mm/cma_debug.c
patch
|
blob
|
history
diff --git
a/mm/cma_debug.c
b/mm/cma_debug.c
index ae41faeed596a2e5fcff34d1d1daa5270414936e..0b377536ccde84419222e851b334f8453955232f 100644
(file)
--- a/
mm/cma_debug.c
+++ b/
mm/cma_debug.c
@@
-103,7
+103,7
@@
static int cma_alloc_mem(struct cma *cma, int count)
if (!mem)
return -ENOMEM;
- p = cma_alloc(cma, count,
CONFIG_CMA_ALIGNMENT
);
+ p = cma_alloc(cma, count,
0
);
if (!p) {
kfree(mem);
return -ENOMEM;