summaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2008-03-19 15:58:11 +0100
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:40:59 +0200
commitb552da8740222c35bcd83c9be7b27185bfb6d53c (patch)
treea70bc63a224d850ecf6935d9bb8a508d8f4764d2 /Documentation/kernel-parameters.txt
parent037cab07e9515149fecc2274775807f06ea6b036 (diff)
x86 iommu: add more documentation
Fix coding style in pci-dma_64.c and add stubs for documentation. I hope someone fills the rest, I understand maybe off and soft... Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index dafd001bf83..43c527d72f2 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -812,6 +812,19 @@ and is between 256 and 4096 characters. It is defined in the file
inttest= [IA64]
+ iommu= [x86]
+ off
+ force
+ noforce
+ biomerge
+ panic
+ nopanic
+ merge
+ nomerge
+ forcesac
+ soft
+
+
intel_iommu= [DMAR] Intel IOMMU driver (DMAR) option
off
Disable intel iommu driver.