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 f7492cd10093..bf6303ec0bde 100644 --- 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 | |||
| 958 | 958 | ||
| 959 | l2cr= [PPC] | 959 | l2cr= [PPC] |
| 960 | 960 | ||
| 961 | l3cr= [PPC] | ||
| 962 | |||
| 961 | lapic [X86-32,APIC] Enable the local APIC even if BIOS | 963 | lapic [X86-32,APIC] Enable the local APIC even if BIOS |
| 962 | disabled it. | 964 | disabled it. |
| 963 | 965 | ||
| @@ -1284,8 +1286,16 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 1284 | noexec [IA-64] | 1286 | noexec [IA-64] |
| 1285 | 1287 | ||
| 1286 | noexec [X86-32,X86-64] | 1288 | noexec [X86-32,X86-64] |
| 1289 | On X86-32 available only on PAE configured kernels. | ||
| 1287 | noexec=on: enable non-executable mappings (default) | 1290 | noexec=on: enable non-executable mappings (default) |
| 1288 | noexec=off: disable nn-executable mappings | 1291 | noexec=off: disable non-executable mappings |
| 1292 | |||
| 1293 | noexec32 [X86-64] | ||
| 1294 | This affects only 32-bit executables. | ||
| 1295 | noexec32=on: enable non-executable mappings (default) | ||
| 1296 | read doesn't imply executable mappings | ||
| 1297 | noexec32=off: disable non-executable mappings | ||
| 1298 | read implies executable mappings | ||
| 1289 | 1299 | ||
| 1290 | nofxsr [BUGS=X86-32] Disables x86 floating point extended | 1300 | nofxsr [BUGS=X86-32] Disables x86 floating point extended |
| 1291 | register save and restore. The kernel will only save | 1301 | register save and restore. The kernel will only save |