summaryrefslogtreecommitdiff
path: root/include/asm-x86
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2008-09-08 13:10:12 +0400
committerIngo Molnar <mingo@elte.hu>2008-09-08 17:50:06 +0400
commit8a53ad675f86ee003482b557da944e070d3c4859 (patch)
treef20f205bb29fec54405a60b706d9b444f79cd8e9 /include/asm-x86
parentde9f521fb72dd091aa4989fe2e004ecf4785a850 (diff)
downloadlinux-8a53ad675f86ee003482b557da944e070d3c4859.tar.xz
x86: fix nommu_alloc_coherent allocation with NULL device argument
We need to use __GFP_DMA for NULL device argument (fallback_dev) with pci-nommu. It's a hack for ISA (and some old code) so we need to use GFP_DMA. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/dma-mapping.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
index 088c56814aa3..ad8b49032d18 100644
--- a/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@ -246,6 +246,8 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
struct dma_mapping_ops *ops = get_dma_ops(dev);
void *memory;
+ gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
+
if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))
return memory;