diff options
Diffstat (limited to 'arch/x86/mm/init_64.c')
-rw-r--r-- | arch/x86/mm/init_64.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 66d6be85df82..1753e8020df6 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
@@ -85,7 +85,7 @@ early_param("gbpages", parse_direct_gbpages_on); | |||
85 | pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP; | 85 | pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP; |
86 | EXPORT_SYMBOL_GPL(__supported_pte_mask); | 86 | EXPORT_SYMBOL_GPL(__supported_pte_mask); |
87 | 87 | ||
88 | static int do_not_nx __cpuinitdata; | 88 | static int disable_nx __cpuinitdata; |
89 | 89 | ||
90 | /* | 90 | /* |
91 | * noexec=on|off | 91 | * noexec=on|off |
@@ -100,9 +100,9 @@ static int __init nonx_setup(char *str) | |||
100 | return -EINVAL; | 100 | return -EINVAL; |
101 | if (!strncmp(str, "on", 2)) { | 101 | if (!strncmp(str, "on", 2)) { |
102 | __supported_pte_mask |= _PAGE_NX; | 102 | __supported_pte_mask |= _PAGE_NX; |
103 | do_not_nx = 0; | 103 | disable_nx = 0; |
104 | } else if (!strncmp(str, "off", 3)) { | 104 | } else if (!strncmp(str, "off", 3)) { |
105 | do_not_nx = 1; | 105 | disable_nx = 1; |
106 | __supported_pte_mask &= ~_PAGE_NX; | 106 | __supported_pte_mask &= ~_PAGE_NX; |
107 | } | 107 | } |
108 | return 0; | 108 | return 0; |
@@ -114,7 +114,7 @@ void __cpuinit check_efer(void) | |||
114 | unsigned long efer; | 114 | unsigned long efer; |
115 | 115 | ||
116 | rdmsrl(MSR_EFER, efer); | 116 | rdmsrl(MSR_EFER, efer); |
117 | if (!(efer & EFER_NX) || do_not_nx) | 117 | if (!(efer & EFER_NX) || disable_nx) |
118 | __supported_pte_mask &= ~_PAGE_NX; | 118 | __supported_pte_mask &= ~_PAGE_NX; |
119 | } | 119 | } |
120 | 120 | ||