diff options
| author | Alex Williamson <alex.williamson@hp.com> | 2009-07-30 16:15:18 -0600 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-09-09 13:29:28 -0700 |
| commit | 80286879c209034245f0a28a2171d2ec23b7481c (patch) | |
| tree | 9ff5094c1f45e51213f35606f99400ce44160b32 /arch/x86/kernel | |
| parent | 1d4a433fc4e9c7dbfc2069a8f1a1f4338b982427 (diff) | |
| download | blackbird-op-linux-80286879c209034245f0a28a2171d2ec23b7481c.tar.gz blackbird-op-linux-80286879c209034245f0a28a2171d2ec23b7481c.zip | |
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/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/pci-dma.c | 4 |
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); |
