Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit f5a1b191b37ac2609e2babeec1b21f411da93e4d

Authored by Jiri Slaby
Committed by Ingo Molnar
1 parent 4a9f54cfd2
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 2 changed files with 11 additions and 3 deletions Side-by-side Diff

Documentation/kernel-parameters.txt
Diff comments   View file @ f5a1b19
... ... @@ -1280,8 +1280,16 @@
1280 1280 noexec [IA-64]
1281 1281  
1282 1282 noexec [X86-32,X86-64]
  1283 + On X86-32 available only on PAE configured kernels.
1283 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 1294 nofxsr [BUGS=X86-32] Disables x86 floating point extended
1287 1295 register save and restore. The kernel will only save
arch/x86/kernel/setup64.c
Diff comments   View file @ f5a1b19
... ... @@ -74,8 +74,8 @@
74 74 Control non executable heap for 32bit processes.
75 75 To control the stack too use noexec=off
76 76  
77   -on PROT_READ does not imply PROT_EXEC for 32bit processes
78   -off PROT_READ implies PROT_EXEC (default)
  77 +on PROT_READ does not imply PROT_EXEC for 32bit processes (default)
  78 +off PROT_READ implies PROT_EXEC
79 79 */
80 80 static int __init nonx32_setup(char *str)
81 81 {