diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2009-11-14 06:46:36 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-15 03:03:09 -0500 |
commit | a3b28ee1090072092e2be043c24df94230e725b2 (patch) | |
tree | 65bae068efde74fffff6efb15e7b8a87a89fc2f2 /arch/x86/kernel/pci-swiotlb.c | |
parent | b18485e7acfe1a634615d1c628ef644c0d58d472 (diff) |
x86: Set dma_ops to nommu_dma_ops by default
We set dma_ops to nommu_dma_ops at two different places for
x86_32 and x86_64. This unifies them by setting dma_ops to
nommu_dma_ops by default.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
LKML-Reference: <1258199198-16657-2-git-send-email-fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/pci-swiotlb.c')
-rw-r--r-- | arch/x86/kernel/pci-swiotlb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c index a6e5d0ffa3a7..e36e71daa44c 100644 --- a/arch/x86/kernel/pci-swiotlb.c +++ b/arch/x86/kernel/pci-swiotlb.c | |||
@@ -61,8 +61,7 @@ int __init pci_swiotlb_init(void) | |||
61 | if (swiotlb) { | 61 | if (swiotlb) { |
62 | swiotlb_init(0); | 62 | swiotlb_init(0); |
63 | dma_ops = &swiotlb_dma_ops; | 63 | dma_ops = &swiotlb_dma_ops; |
64 | } else | 64 | } |
65 | dma_ops = &nommu_dma_ops; | ||
66 | 65 | ||
67 | return swiotlb_force; | 66 | return swiotlb_force; |
68 | } | 67 | } |