Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

[karo-tx-linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index f7492cd10093703a7d2d0b2360f5c2544d85c7b3..bf6303ec0bde4784b71370457eb8510c6198ed05 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -958,6 +958,8 @@ and is between 256 and 4096 characters. It is defined in the file
 
        l2cr=           [PPC]
 
+       l3cr=           [PPC]
+
        lapic           [X86-32,APIC] Enable the local APIC even if BIOS
                        disabled it.
 
@@ -1284,8 +1286,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