arm64: Limit the CMA buffer to 32-bit if ZONE_DMA
authorCatalin Marinas <catalin.marinas@arm.com>
Fri, 13 Jun 2014 12:41:20 +0000 (13:41 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 18 Jun 2014 11:40:56 +0000 (12:40 +0100)
When the CMA buffer is allocated, it is too early to know whether
devices will require ZONE_DMA memory. This patch limits the CMA buffer
to (DMA_BIT_MASK(32) + 1) if CONFIG_ZONE_DMA is enabled.

In addition, it computes the dma_to_phys(DMA_BIT_MASK(32)) before the
increment (no current functional change).

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/mm/init.c

Simple merge