summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@hp.com>2009-07-30 16:15:18 -0600
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-08-03 10:06:58 +0100
commitcfc65dd57967f2e0c7b3a8b73e6d12470b1cf1c1 (patch)
tree34a6d7474fa6816998c1370f821bb548eb283bc6 /arch
parent86f4d0123b1fddb47d35b9a893f8c0b94bf89abe (diff)
iommu=pt is a valid early param
This avoids a "Malformed early option 'iommu'" warning on boot when trying to use pass-through mode. Signed-off-by: Alex Williamson <alex.williamson@hp.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
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)
if (!strncmp(p, "soft", 4))
swiotlb = 1;
#endif
- if (!strncmp(p, "pt", 2)) {
+ if (!strncmp(p, "pt", 2))
iommu_pass_through = 1;
- return 1;
- }
gart_parse_options(p);