aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/init_64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/mm/init_64.c')
-rw-r--r--arch/x86/mm/init_64.c28
1 files changed, 15 insertions, 13 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 9c750d6307b0..1f6806b62eb8 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -93,12 +93,13 @@ EXPORT_SYMBOL_GPL(__supported_pte_mask);
93 93
94static int do_not_nx __cpuinitdata; 94static int do_not_nx __cpuinitdata;
95 95
96/* noexec=on|off 96/*
97Control non executable mappings for 64bit processes. 97 * noexec=on|off
98 98 * Control non-executable mappings for 64-bit processes.
99on Enable(default) 99 *
100off Disable 100 * on Enable (default)
101*/ 101 * off Disable
102 */
102static int __init nonx_setup(char *str) 103static int __init nonx_setup(char *str)
103{ 104{
104 if (!str) 105 if (!str)
@@ -125,13 +126,14 @@ void __cpuinit check_efer(void)
125 126
126int force_personality32; 127int force_personality32;
127 128
128/* noexec32=on|off 129/*
129Control non executable heap for 32bit processes. 130 * noexec32=on|off
130To control the stack too use noexec=off 131 * Control non executable heap for 32bit processes.
131 132 * To control the stack too use noexec=off
132on PROT_READ does not imply PROT_EXEC for 32bit processes (default) 133 *
133off PROT_READ implies PROT_EXEC 134 * on PROT_READ does not imply PROT_EXEC for 32-bit processes (default)
134*/ 135 * off PROT_READ implies PROT_EXEC
136 */
135static int __init nonx32_setup(char *str) 137static int __init nonx32_setup(char *str)
136{ 138{
137 if (!strcmp(str, "on")) 139 if (!strcmp(str, "on"))