mm-cma-allocation-trigger-fix
authorAndrew Morton <akpm@linux-foundation.org>
Tue, 14 Apr 2015 22:45:05 +0000 (15:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Apr 2015 23:49:00 +0000 (16:49 -0700)
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>
mm/cma_debug.c

index ae41faeed596a2e5fcff34d1d1daa5270414936e..0b377536ccde84419222e851b334f8453955232f 100644 (file)
@@ -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;