summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-07-01 18:56:16 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-07-01 18:56:16 +0100
commit3238c0c4d68d9a9022b411a11a4b933fbdb53a14 (patch)
tree5ea74e43b247ed2ef09b7895cdbd0c2b995952f7 /arch
parentf3a0a52fff4dbfdea2dccc908d00c038481d888e (diff)
downloadtalos-op-linux-3238c0c4d68d9a9022b411a11a4b933fbdb53a14.tar.gz
talos-op-linux-3238c0c4d68d9a9022b411a11a4b933fbdb53a14.zip
intel-iommu: Make iommu=pt work on i386 too
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/pci-dma.c2
1 files changed, 1 insertions, 1 deletions
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);
OpenPOWER on IntegriCloud