SELinux: netlink.c whitespace, syntax, and static declaraction cleanups

[deliverable/linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c867f506366ddd99bfb3048e59df1d425464796d..4b0f1ae31a4c152f4547050e2b3d8cc6b375bb31 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
@@ -1362,6 +1368,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.