diff options
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 4b0f1ae31a4c..dfb5bef24013 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -954,6 +954,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 954 | 954 | ||
| 955 | l2cr= [PPC] | 955 | l2cr= [PPC] |
| 956 | 956 | ||
| 957 | l3cr= [PPC] | ||
| 958 | |||
| 957 | lapic [X86-32,APIC] Enable the local APIC even if BIOS | 959 | lapic [X86-32,APIC] Enable the local APIC even if BIOS |
| 958 | disabled it. | 960 | disabled it. |
| 959 | 961 | ||
| @@ -1280,8 +1282,16 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 1280 | noexec [IA-64] | 1282 | noexec [IA-64] |
| 1281 | 1283 | ||
| 1282 | noexec [X86-32,X86-64] | 1284 | noexec [X86-32,X86-64] |
| 1285 | On X86-32 available only on PAE configured kernels. | ||
| 1283 | noexec=on: enable non-executable mappings (default) | 1286 | noexec=on: enable non-executable mappings (default) |
| 1284 | noexec=off: disable nn-executable mappings | 1287 | noexec=off: disable non-executable mappings |
| 1288 | |||
| 1289 | noexec32 [X86-64] | ||
| 1290 | This affects only 32-bit executables. | ||
| 1291 | noexec32=on: enable non-executable mappings (default) | ||
| 1292 | read doesn't imply executable mappings | ||
| 1293 | noexec32=off: disable non-executable mappings | ||
| 1294 | read implies executable mappings | ||
| 1285 | 1295 | ||
| 1286 | nofxsr [BUGS=X86-32] Disables x86 floating point extended | 1296 | nofxsr [BUGS=X86-32] Disables x86 floating point extended |
| 1287 | register save and restore. The kernel will only save | 1297 | register save and restore. The kernel will only save |