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:
1d4a433
)
PCI iommu: iommu=pt is a valid early param
author
Alex Williamson
<alex.williamson@hp.com>
Thu, 30 Jul 2009 22:15:18 +0000
(16:15 -0600)
committer
Jesse Barnes
<jbarnes@virtuousgeek.org>
Wed, 9 Sep 2009 20:29:28 +0000
(13:29 -0700)
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>
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
1a041bc
..
ae13e34
100644
(file)
--- 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);