Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index dafd001bf83339829c6409bec6e6a1ff2a73f9c1..dfb5bef240132dbb2caccd67da5b65652caef537 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -366,6 +366,12 @@ and is between 256 and 4096 characters. It is defined in the file
                        possible to determine what the correct size should be.
                        This option provides an override for these situations.
 
+       security=       [SECURITY] Choose a security module to enable at boot.
+                       If this boot parameter is not specified, only the first
+                       security module asking for security registration will be
+                       loaded. An invalid security module name will be treated
+                       as if no module has been chosen.
+
        capability.disable=
                        [SECURITY] Disable capabilities.  This would normally
                        be used only if an alternative security model is to be
@@ -763,11 +769,11 @@ and is between 256 and 4096 characters. It is defined in the file
                        Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]
 
        ide=            [HW] (E)IDE subsystem
-                       Format: ide=nodma or ide=doubler or ide=reverse
+                       Format: ide=nodma or ide=doubler
                        See Documentation/ide/ide.txt.
 
        ide?=           [HW] (E)IDE subsystem
-                       Format: ide?=noprobe or chipset specific parameters.
+                       Format: ide?=ata66 or chipset specific parameters.
                        See Documentation/ide/ide.txt.
 
        idebus=         [HW] (E)IDE subsystem - VLB/PCI bus speed
@@ -812,6 +818,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.
@@ -928,8 +947,15 @@ and is between 256 and 4096 characters. It is defined in the file
        kstack=N        [X86-32,X86-64] Print N words from the kernel stack
                        in oops dumps.
 
+       kgdboc=         [HW] kgdb over consoles.
+                       Requires a tty driver that supports console polling.
+                       (only serial suported for now)
+                       Format: <serial_device>[,baud]
+
        l2cr=           [PPC]
 
+       l3cr=           [PPC]
+
        lapic           [X86-32,APIC] Enable the local APIC even if BIOS
                        disabled it.
 
@@ -1134,6 +1160,11 @@ and is between 256 and 4096 characters. It is defined in the file
                                 or
                                 memmap=0x10000$0x18690000
 
+       memtest=        [KNL,X86_64] Enable memtest
+                       Format: <integer>
+                       range: 0,4 : pattern number
+                       default : 0 <disable>
+
        meye.*=         [HW] Set MotionEye Camera parameters
                        See Documentation/video4linux/meye.txt.
 
@@ -1251,8 +1282,16 @@ and is between 256 and 4096 characters. It is defined in the file
        noexec          [IA-64]
 
        noexec          [X86-32,X86-64]
+                       On X86-32 available only on PAE configured kernels.
                        noexec=on: enable non-executable mappings (default)
-                       noexec=off: disable nn-executable mappings
+                       noexec=off: disable non-executable mappings
+
+       noexec32        [X86-64]
+                       This affects only 32-bit executables.
+                       noexec32=on: enable non-executable mappings (default)
+                               read doesn't imply executable mappings
+                       noexec32=off: disable non-executable mappings
+                               read implies executable mappings
 
        nofxsr          [BUGS=X86-32] Disables x86 floating point extended
                        register save and restore. The kernel will only save
@@ -1339,6 +1378,10 @@ and is between 256 and 4096 characters. It is defined in the file
 
        nowb            [ARM]
 
+       nptcg=          [IA64] Override max number of concurrent global TLB
+                       purges which is reported from either PAL_VM_SUMMARY or
+                       SAL PALO.
+
        numa_zonelist_order= [KNL, BOOT] Select zonelist order for NUMA.
                        one of ['zone', 'node', 'default'] can be specified
                        This can be set from sysctl after boot.