diff options
Diffstat (limited to 'drivers/pci/dmar.c')
-rw-r--r-- | drivers/pci/dmar.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c index bce9cd7c755a..437399667e5a 100644 --- a/drivers/pci/dmar.c +++ b/drivers/pci/dmar.c | |||
@@ -613,8 +613,7 @@ void __init detect_intel_iommu(void) | |||
613 | "x2apic and Intr-remapping.\n"); | 613 | "x2apic and Intr-remapping.\n"); |
614 | #endif | 614 | #endif |
615 | #ifdef CONFIG_DMAR | 615 | #ifdef CONFIG_DMAR |
616 | if (ret && !no_iommu && !iommu_detected && !swiotlb && | 616 | if (ret && !no_iommu && !iommu_detected && !dmar_disabled) |
617 | !dmar_disabled) | ||
618 | iommu_detected = 1; | 617 | iommu_detected = 1; |
619 | #endif | 618 | #endif |
620 | #ifdef CONFIG_X86 | 619 | #ifdef CONFIG_X86 |