x86: rename do_not_nx to disable_nx in mm/init_64.c
PATCH 1/2 x86: rename do_not_nx to disable_nx in mm/init_64.c
From: Pekka Enberg <[email protected]>
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 <[email protected]>
--- arch/x86/mm/init_64.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/mm/init_64.c +4 -4
@@ -85,7 +85,7 @@ early_param("gbpages", parse_direct_gbpages_on);pteval_t __supported_pte_mask__read_mostly = ~_PAGE_IOMAP;EXPORT_SYMBOL_GPL (__supported_pte_mask); -static int do_not_nx__cpuinitdata ; +static int disable_nx__cpuinitdata ;/* * noexec=on|off
@@ -100,9 +100,9 @@ static int __init nonx_setup(char *str)return -EINVAL ;if (!strncmp (str,"on" ,2 )) { __supported_pte_mask |= _PAGE_NX; - do_not_nx =0 ; + disable_nx =0 ; }else if (!strncmp (str,"off" ,3 )) { - do_not_nx =1 ; + disable_nx =1 ; __supported_pte_mask &= ~_PAGE_NX; }return 0 ;
@@ -114,7 +114,7 @@ void __cpuinit check_efer(void)unsigned long efer;rdmsrl (MSR_EFER , efer); -if (!(efer &EFER_NX ) || do_not_nx) +if (!(efer &EFER_NX ) || disable_nx) __supported_pte_mask &= ~_PAGE_NX; }
Signature · 1 line
1.5.4.3
Commit-ID: 5dd61dfabcaa5bfb67afb8a2d255bd1e156562e3 Gitweb: http://git.kernel.org/tip/5dd61dfabcaa5bfb67afb8a2d255bd1e156562e3 Author: "Pekka Enberg" <[email protected]> AuthorDate: Thu, 5 Mar 2009 17:04:57 +0200 Commit: Ingo Molnar <[email protected]> CommitDate: Fri, 6 Mar 2009 15:25:52 +0100
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 <[email protected]>
LKML-Reference: <1236265497.31324.11.camel@penberg-laptop>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/mm/init_64.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/mm/init_64.c +4 -4
@@ -85,7 +85,7 @@ early_param("gbpages", parse_direct_gbpages_on);pteval_t __supported_pte_mask__read_mostly = ~_PAGE_IOMAP;EXPORT_SYMBOL_GPL (__supported_pte_mask); -static int do_not_nx__cpuinitdata ; +static int disable_nx__cpuinitdata ;/* * noexec=on|off
@@ -100,9 +100,9 @@ static int __init nonx_setup(char *str)return -EINVAL ;if (!strncmp (str,"on" ,2 )) { __supported_pte_mask |= _PAGE_NX; - do_not_nx =0 ; + disable_nx =0 ; }else if (!strncmp (str,"off" ,3 )) { - do_not_nx =1 ; + disable_nx =1 ; __supported_pte_mask &= ~_PAGE_NX; }return 0 ;
@@ -114,7 +114,7 @@ void __cpuinit check_efer(void)unsigned long efer;rdmsrl (MSR_EFER , efer); -if (!(efer &EFER_NX ) || do_not_nx) +if (!(efer &EFER_NX ) || disable_nx) __supported_pte_mask &= ~_PAGE_NX; }