summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/pci-swiotlb.c
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2009-11-14 20:46:36 +0900
committerIngo Molnar <mingo@elte.hu>2009-11-15 09:03:09 +0100
commita3b28ee1090072092e2be043c24df94230e725b2 (patch)
tree65bae068efde74fffff6efb15e7b8a87a89fc2f2 /arch/x86/kernel/pci-swiotlb.c
parentb18485e7acfe1a634615d1c628ef644c0d58d472 (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.c3
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)
if (swiotlb) {
swiotlb_init(0);
dma_ops = &swiotlb_dma_ops;
- } else
- dma_ops = &nommu_dma_ops;
+ }
return swiotlb_force;
}