diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-25 22:36:10 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-25 22:44:30 +0000 |
| commit | c06e004c72aa0d1acbc239fb995aa3d823543a8a (patch) | |
| tree | 62d438159176d4f0090144073297fc093907ba81 /arch/arm/mm | |
| parent | ce63e6bd0ac7eca242562ee07f518bacc8eaa5ce (diff) | |
| download | op-kernel-dev-c06e004c72aa0d1acbc239fb995aa3d823543a8a.zip op-kernel-dev-c06e004c72aa0d1acbc239fb995aa3d823543a8a.tar.gz | |
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>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) |
