From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 13 Jun 2014 12:41:20 +0000 (+0100)
Subject: arm64: Limit the CMA buffer to 32-bit if ZONE_DMA
X-Git-Tag: omap-for-v3.16/fixes-rc4~85^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d5a5612bc;p=pandora-kernel.git

arm64: Limit the CMA buffer to 32-bit if ZONE_DMA

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>
---

Reading git-diff-tree failed