OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f3a0a52
)
intel-iommu: Make iommu=pt work on i386 too
author
David Woodhouse
<David.Woodhouse@intel.com>
Wed, 1 Jul 2009 17:56:16 +0000
(18:56 +0100)
committer
David Woodhouse
<David.Woodhouse@intel.com>
Wed, 1 Jul 2009 17:56:16 +0000
(18:56 +0100)
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
arch/x86/kernel/pci-dma.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/pci-dma.c
b/arch/x86/kernel/pci-dma.c
index
4763047
..
1a041bc
100644
(file)
--- 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);