diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2015-04-14 15:45:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 16:49:00 -0700 |
| commit | 875abdb6d43401c745ee8bc6d240f119a601d21f (patch) | |
| tree | d0cf9a6abf43becfc05f842c397a558af522dfac | |
| parent | 8325330b026509127d4541e0f511c0c10648c2d5 (diff) | |
| download | linux-stable-875abdb6d43401c745ee8bc6d240f119a601d21f.tar.gz linux-stable-875abdb6d43401c745ee8bc6d240f119a601d21f.tar.bz2 linux-stable-875abdb6d43401c745ee8bc6d240f119a601d21f.zip | |
mm-cma-allocation-trigger-fix
s/CONFIG_CMA_ALIGNMENT/0/, per Joonsoo
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Laura Abbott <lauraa@codeaurora.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | mm/cma_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/cma_debug.c b/mm/cma_debug.c index ae41faeed596..0b377536ccde 100644 --- 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; |