The following commit has been merged in the linux branch: commit c06e004c72aa0d1acbc239fb995aa3d823543a8a Author: Russell King rmk+kernel@arm.linux.org.uk Date: Sun Oct 25 22:36:10 2009 +0000

ARM: Use GFP_DMA only for masks _less_ than 32-bit

We were using GFP_DMA for masks other than 0xffffffff, which is wrong when some masks are initialized to 0xffffffffffffffff. This caused such masks to obtain memory from the precious DMA pool.

Signed-off-by: Russell King rmk+kernel@arm.linux.org.uk

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index b30925f..b9590a7 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -205,7 +205,7 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp,

order = get_order(size);

- if (mask != 0xffffffff) + if (mask < 0xffffffffULL) gfp |= GFP_DMA;

page = alloc_pages(gfp, order); @@ -289,7 +289,7 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp, if (!mask) goto error;

- if (mask != 0xffffffff) + if (mask < 0xffffffffULL) gfp |= GFP_DMA; virt = kmalloc(size, gfp); if (!virt)