Gitweb:     http://git.kernel.org/linus/3238c0c4d68d9a9022b411a11a4b933fbdb53a14
Commit:     3238c0c4d68d9a9022b411a11a4b933fbdb53a14
Parent:     f3a0a52fff4dbfdea2dccc908d00c038481d888e
Author:     David Woodhouse <David.Woodhouse@intel.com>
AuthorDate: Wed Jul 1 18:56:16 2009 +0100
Committer:  David Woodhouse <David.Woodhouse@intel.com>
CommitDate: Wed Jul 1 18:56:16 2009 +0100

    intel-iommu: Make iommu=pt work on i386 too
    
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
 arch/x86/kernel/pci-dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 4763047..1a041bc 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);
 
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html