From: David Woodhouse <David.Woodhouse@intel.com>
Date: Wed, 1 Jul 2009 17:56:16 +0000 (+0100)
Subject: intel-iommu: Make iommu=pt work on i386 too
X-Git-Tag: firefly_0821_release~13508^2~6
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3238c0c4d68d9a9022b411a11a4b933fbdb53a14;p=firefly-linux-kernel-4.4.55.git

intel-iommu: Make iommu=pt work on i386 too

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 47630479b067..1a041bcf506b 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -211,11 +211,11 @@ static __init int iommu_setup(char *p)
 #ifdef CONFIG_SWIOTLB
 		if (!strncmp(p, "soft", 4))
 			swiotlb = 1;
+#endif
 		if (!strncmp(p, "pt", 2)) {
 			iommu_pass_through = 1;
 			return 1;
 		}
-#endif
 
 		gart_parse_options(p);