aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-03-25 10:31:04 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 12:10:56 -0500
commit7682968b7d4d42bb076051b962c3926b4c98539a (patch)
tree96ec205d6395056666e07ce2a1d4f9177582ae9c /arch/x86_64
parentdf92004ce60a0bb60c8315903c0765873c34a702 (diff)
[PATCH] x86_64: Change default setting for noexec32 to match i386 kernel
This means i386 processes compiled with a recent compiler will get non executable heap by default now. This is the same default as a 32bit PAE kernel would use on a NX enabled CPU. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/kernel/setup64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c
index 356b462cb0ec..eabdb63fec31 100644
--- a/arch/x86_64/kernel/setup64.c
+++ b/arch/x86_64/kernel/setup64.c
@@ -59,7 +59,7 @@ int __init nonx_setup(char *str)
59} 59}
60__setup("noexec=", nonx_setup); /* parsed early actually */ 60__setup("noexec=", nonx_setup); /* parsed early actually */
61 61
62int force_personality32 = READ_IMPLIES_EXEC; 62int force_personality32 = 0;
63 63
64/* noexec32=on|off 64/* noexec32=on|off
65Control non executable heap for 32bit processes. 65Control non executable heap for 32bit processes.