Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 112829
b: refs/heads/master
c: deed05b
h: refs/heads/master
i:
  112827: 2a6d0ba
v: v3
  • Loading branch information
Ingo Molnar committed Sep 5, 2008
1 parent 52bfb10 commit a4b328f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bd220a24a9263eaa70d5e6821383085950b5a13c
refs/heads/master: deed05b7c017e49473e8c386efba196410fd18b3
28 changes: 15 additions & 13 deletions trunk/arch/x86/mm/init_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,13 @@ EXPORT_SYMBOL_GPL(__supported_pte_mask);

static int do_not_nx __cpuinitdata;

/* noexec=on|off
Control non executable mappings for 64bit processes.
on Enable(default)
off Disable
*/
/*
* noexec=on|off
* Control non-executable mappings for 64-bit processes.
*
* on Enable (default)
* off Disable
*/
static int __init nonx_setup(char *str)
{
if (!str)
Expand All @@ -125,13 +126,14 @@ void __cpuinit check_efer(void)

int force_personality32;

/* noexec32=on|off
Control non executable heap for 32bit processes.
To control the stack too use noexec=off
on PROT_READ does not imply PROT_EXEC for 32bit processes (default)
off PROT_READ implies PROT_EXEC
*/
/*
* noexec32=on|off
* Control non executable heap for 32bit processes.
* To control the stack too use noexec=off
*
* on PROT_READ does not imply PROT_EXEC for 32-bit processes (default)
* off PROT_READ implies PROT_EXEC
*/
static int __init nonx32_setup(char *str)
{
if (!strcmp(str, "on"))
Expand Down

0 comments on commit a4b328f

Please sign in to comment.