ARM: mm: don't limit default CMA region only to low memory

DMA-mapping supports CMA regions places either in low or high memory, so
there is no longer needed to limit default CMA regions only to low memory.
 The real limit is still defined by architecture specific DMA limit.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Cc: Daniel Drake <drake@endlessm.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 9221645dd192dbbfc0b0ae479642583487f99c76..92bba32d92304c4383d43bee8ef95f7d988602c6 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -322,7 +322,7 @@ void __init arm_memblock_init(const struct machine_desc *mdesc)
         * reserve memory for DMA contigouos allocations,
         * must come from DMA area inside low memory
         */
-       dma_contiguous_reserve(min(arm_dma_limit, arm_lowmem_limit));
+       dma_contiguous_reserve(arm_dma_limit);
 
        arm_memblock_steal_permitted = false;
        memblock_dump_all();