aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@hp.com>2009-07-30 18:15:18 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-09-09 16:29:28 -0400
commit80286879c209034245f0a28a2171d2ec23b7481c (patch)
tree9ff5094c1f45e51213f35606f99400ce44160b32 /arch
parent1d4a433fc4e9c7dbfc2069a8f1a1f4338b982427 (diff)
PCI iommu: iommu=pt is a valid early param
This avoids a "Malformed early option 'iommu'" on boot when trying to use pass-through mode. Signed-off-by: Alex Williamson <alex.williamson@hp.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/pci-dma.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 1a041bcf506b..ae13e34f7248 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -212,10 +212,8 @@ static __init int iommu_setup(char *p)
212 if (!strncmp(p, "soft", 4)) 212 if (!strncmp(p, "soft", 4))
213 swiotlb = 1; 213 swiotlb = 1;
214#endif 214#endif
215 if (!strncmp(p, "pt", 2)) { 215 if (!strncmp(p, "pt", 2))
216 iommu_pass_through = 1; 216 iommu_pass_through = 1;
217 return 1;
218 }
219 217
220 gart_parse_options(p); 218 gart_parse_options(p);
221 219