aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2008-09-08 18:10:11 +0900
committerIngo Molnar <mingo@elte.hu>2008-09-08 15:50:06 +0200
commitde9f521fb72dd091aa4989fe2e004ecf4785a850 (patch)
tree7e19aa05aec7f859ac2ca036da3cad19a055806e
parent3a80b6aa271eb08a3da1a04b5cbdcdc19d4a5ae0 (diff)
x86: move pci-nommu's dma_mask check to common code
The check to see if dev->dma_mask is NULL in pci-nommu is more appropriate for dma_alloc_coherent(). 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>
-rw-r--r--arch/x86/kernel/pci-nommu.c3
-rw-r--r--include/asm-x86/dma-mapping.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
index 73853d3fdca..0f51883cc6a 100644
--- a/arch/x86/kernel/pci-nommu.c
+++ b/arch/x86/kernel/pci-nommu.c
@@ -80,9 +80,6 @@ nommu_alloc_coherent(struct device *hwdev, size_t size,
int node;
struct page *page;
- if (hwdev->dma_mask == NULL)
- return NULL;
-
gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
gfp |= __GFP_ZERO;
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
index 3a9a6f5e681..088c56814aa 100644
--- a/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@ -254,6 +254,9 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
gfp |= GFP_DMA;
}
+ if (!dev->dma_mask)
+ return NULL;
+
if (ops->alloc_coherent)
return ops->alloc_coherent(dev, size,
dma_handle, gfp);