aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/pci-nommu.c
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 /arch/x86/kernel/pci-nommu.c
parentia64: dma_alloc_coherent always use GFP_DMA (diff)
downloadlinux-dev-de9f521fb72dd091aa4989fe2e004ecf4785a850.tar.xz
linux-dev-de9f521fb72dd091aa4989fe2e004ecf4785a850.zip
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>
Diffstat (limited to 'arch/x86/kernel/pci-nommu.c')
-rw-r--r--arch/x86/kernel/pci-nommu.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
index 73853d3fdcac..0f51883cc6a8 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;