diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
| commit | 559300bc0ef7ccd541656f1189d38e7088389559 (patch) | |
| tree | cd1682881ca4246e9c5a1e8632be4bdd9d9706c6 /arch/arm/mm/dma-mapping.c | |
| parent | 5416bf33f92a4104dbcd6062bf377c8421ca3cfd (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge commit 'v2.6.32'
Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h
Diffstat (limited to 'arch/arm/mm/dma-mapping.c')
| -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 b30925fcbcdc..b9590a7085ca 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, | |||
| 205 | 205 | ||
| 206 | order = get_order(size); | 206 | order = get_order(size); |
| 207 | 207 | ||
| 208 | if (mask != 0xffffffff) | 208 | if (mask < 0xffffffffULL) |
| 209 | gfp |= GFP_DMA; | 209 | gfp |= GFP_DMA; |
| 210 | 210 | ||
| 211 | page = alloc_pages(gfp, order); | 211 | page = alloc_pages(gfp, order); |
| @@ -289,7 +289,7 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp, | |||
| 289 | if (!mask) | 289 | if (!mask) |
| 290 | goto error; | 290 | goto error; |
| 291 | 291 | ||
| 292 | if (mask != 0xffffffff) | 292 | if (mask < 0xffffffffULL) |
| 293 | gfp |= GFP_DMA; | 293 | gfp |= GFP_DMA; |
| 294 | virt = kmalloc(size, gfp); | 294 | virt = kmalloc(size, gfp); |
| 295 | if (!virt) | 295 | if (!virt) |