Merge git://git.infradead.org/iommu-2.6

[karo-tx-linux.git] / arch / x86 / kernel / pci-swiotlb.c

diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
index e8a35016115f92369663ef7c695cd5c41f45eec7..aaa6b7839f1e3541e2a36bb67c770bf343075de7 100644 (file)
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
@@ -46,9 +46,8 @@ void __init pci_swiotlb_init(void)
 {
        /* don't initialize swiotlb if iommu=off (no_iommu=1) */
 #ifdef CONFIG_X86_64
-       if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN) ||
-               iommu_pass_through)
-              swiotlb = 1;
+       if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN))
+               swiotlb = 1;
 #endif
        if (swiotlb_force)
                swiotlb = 1;