diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /arch/arm/mm/dma-mapping.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
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) |