diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-09-08 05:10:11 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-08 09:50:06 -0400 |
commit | de9f521fb72dd091aa4989fe2e004ecf4785a850 (patch) | |
tree | 7e19aa05aec7f859ac2ca036da3cad19a055806e /arch/x86/kernel/pci-nommu.c | |
parent | 3a80b6aa271eb08a3da1a04b5cbdcdc19d4a5ae0 (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>
Diffstat (limited to 'arch/x86/kernel/pci-nommu.c')
-rw-r--r-- | arch/x86/kernel/pci-nommu.c | 3 |
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, | |||
80 | int node; | 80 | int node; |
81 | struct page *page; | 81 | struct page *page; |
82 | 82 | ||
83 | if (hwdev->dma_mask == NULL) | ||
84 | return NULL; | ||
85 | |||
86 | gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); | 83 | gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); |
87 | gfp |= __GFP_ZERO; | 84 | gfp |= __GFP_ZERO; |
88 | 85 | ||