diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2008-04-12 04:28:25 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 13:19:55 -0400 |
commit | f5a1b191b37ac2609e2babeec1b21f411da93e4d (patch) | |
tree | 6017595df33f0ecad9f506cc560d86248032873e /Documentation | |
parent | 4a9f54cfd21f313b9858f951783512d3f14e58a4 (diff) |
x86: fix exec mappings comments
- noexec32 is on by default for years already
- add noexec32 to kernel-parameters and fix noexec typo in there
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/kernel-parameters.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 4b0f1ae31a4c..f4839606988b 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1280,8 +1280,16 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1280 | noexec [IA-64] | 1280 | noexec [IA-64] |
1281 | 1281 | ||
1282 | noexec [X86-32,X86-64] | 1282 | noexec [X86-32,X86-64] |
1283 | On X86-32 available only on PAE configured kernels. | ||
1283 | noexec=on: enable non-executable mappings (default) | 1284 | noexec=on: enable non-executable mappings (default) |
1284 | noexec=off: disable nn-executable mappings | 1285 | noexec=off: disable non-executable mappings |
1286 | |||
1287 | noexec32 [X86-64] | ||
1288 | This affects only 32-bit executables. | ||
1289 | noexec32=on: enable non-executable mappings (default) | ||
1290 | read doesn't imply executable mappings | ||
1291 | noexec32=off: disable non-executable mappings | ||
1292 | read implies executable mappings | ||
1285 | 1293 | ||
1286 | nofxsr [BUGS=X86-32] Disables x86 floating point extended | 1294 | nofxsr [BUGS=X86-32] Disables x86 floating point extended |
1287 | register save and restore. The kernel will only save | 1295 | register save and restore. The kernel will only save |