path: root/Documentation
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-11 08:23:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-11 08:23:22 -0800
commit9ce04f9238cafcfd09a502f2bc8c13b5f44ec590 (patch)
treef55b7c0ef48ea5b3bbd2971036ba54b666e8c4ce /Documentation
parentb3f2caaaa82440af06b39c2c92e4fa8122d75465 (diff)
parent06eb23b1ba39c61ee5d5faeb42a097635693e370 (diff)
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ptrace, x86: fix the usage of ptrace_fork() i8327: fix outb() parameter order x86: fix math_emu register frame access x86: math_emu info cleanup x86: include correct %gs in a.out core dump x86, vmi: put a missing paravirt_release_pmd in pgd_dtor x86: find nr_irqs_gsi with mp_ioapic_routing x86: add clflush before monitor for Intel 7400 series x86: disable intel_iommu support by default x86: don't apply __supported_pte_mask to non-present ptes x86: fix grammar in user-visible BIOS warning x86/Kconfig.cpu: make Kconfig help readable in the console x86, 64-bit: print DMI info in the oops trace
Diffstat (limited to 'Documentation')
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d8362cf9909..b182626739e 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -937,6 +937,8 @@ and is between 256 and 4096 characters. It is defined in the file
intel_iommu= [DMAR] Intel IOMMU driver (DMAR) option
+ on
+ Enable intel iommu driver.
Disable intel iommu driver.
igfx_off [Default Off]