Commit 875abdb6 authored Apr 14, 2015 by Andrew Morton Committed by Linus Torvalds Apr 14, 2015

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>

parent 8325330b

mm/cma_debug.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;