From 430dc760025580a683be38fa3a469e1119584e0e Mon Sep 17 00:00:00 2001 From: Laura Abbott <lauraa@codeaurora.org> Date: Fri, 12 Apr 2013 09:45:48 -0700 Subject: [PATCH] Revert "Revert "cma: use MEMBLOCK_ALLOC_ANYWHERE for placing CMA regions"" This reverts commit 74ab7c1e198200036a84acd88c28ee9a441e5167. Appropriate calls have now been made to flush outstanding highmem mappings. Place the CMA region in highmem again. Change-Id: I66baa055ed31074f2f21c77d46e3a5fc906e9683 Signed-off-by: Laura Abbott <lauraa@codeaurora.org> --- drivers/base/dma-contiguous.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c index 9bdfa4551847..ebfe0043cb8d 100644 --- a/drivers/base/dma-contiguous.c +++ b/drivers/base/dma-contiguous.c @@ -224,7 +224,7 @@ int __init cma_fdt_scan(unsigned long node, const char *uname, pr_info("Found %s, memory base %lx, size %ld MiB\n", uname, (unsigned long)base, (unsigned long)size / SZ_1M); - dma_contiguous_reserve_area(size, &base, 0, name); + dma_contiguous_reserve_area(size, &base, MEMBLOCK_ALLOC_ANYWHERE, name); return 0; } -- GitLab