x86: rename do_not_nx to disable_nx in mm/init_64.c
As a preparational step for unifying noexec handling on 32-bit and 64-bit, rename the do_not_nx variable to disable_nx on 64-bit. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> LKML-Reference: <1236265497.31324.11.camel@penberg-laptop> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
c77a3b59c6
commit
5dd61dfabc
|
@ -85,7 +85,7 @@ early_param("gbpages", parse_direct_gbpages_on);
|
||||||
pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
|
pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
|
||||||
EXPORT_SYMBOL_GPL(__supported_pte_mask);
|
EXPORT_SYMBOL_GPL(__supported_pte_mask);
|
||||||
|
|
||||||
static int do_not_nx __cpuinitdata;
|
static int disable_nx __cpuinitdata;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* noexec=on|off
|
* noexec=on|off
|
||||||
|
@ -100,9 +100,9 @@ static int __init nonx_setup(char *str)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (!strncmp(str, "on", 2)) {
|
if (!strncmp(str, "on", 2)) {
|
||||||
__supported_pte_mask |= _PAGE_NX;
|
__supported_pte_mask |= _PAGE_NX;
|
||||||
do_not_nx = 0;
|
disable_nx = 0;
|
||||||
} else if (!strncmp(str, "off", 3)) {
|
} else if (!strncmp(str, "off", 3)) {
|
||||||
do_not_nx = 1;
|
disable_nx = 1;
|
||||||
__supported_pte_mask &= ~_PAGE_NX;
|
__supported_pte_mask &= ~_PAGE_NX;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -114,7 +114,7 @@ void __cpuinit check_efer(void)
|
||||||
unsigned long efer;
|
unsigned long efer;
|
||||||
|
|
||||||
rdmsrl(MSR_EFER, efer);
|
rdmsrl(MSR_EFER, efer);
|
||||||
if (!(efer & EFER_NX) || do_not_nx)
|
if (!(efer & EFER_NX) || disable_nx)
|
||||||
__supported_pte_mask &= ~_PAGE_NX;
|
__supported_pte_mask &= ~_PAGE_NX;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue