Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 1840a0578a42..9261327b49f3 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -3266,7 +3266,7 @@ int __init intel_iommu_init(void)
          * Check the need for DMA-remapping initialization now.
          * Above initialization will also be used by Interrupt-remapping.
          */
-        if (no_iommu || swiotlb || dmar_disabled)
+        if (no_iommu || dmar_disabled)
                 return -ENODEV;
 
         iommu_init_mempool();
@@ -3287,7 +3287,9 @@ int __init intel_iommu_init(void)
         "PCI-DMA: Intel(R) Virtualization Technology for Directed I/O\n");
 
         init_timer(&unmap_timer);
-        force_iommu = 1;
+#ifdef CONFIG_SWIOTLB
+        swiotlb = 0;
+#endif
         dma_ops = &intel_dma_ops;
 
         init_iommu_sysfs();