i386: minor nx handling adjustment
PATCH 1/1 i386: minor nx handling adjustment
Constrain __supported_pte_mask and NX handling to just the PAE kernel.
Signed-off-by Jan Beulich <[email protected]>
arch/i386/mm/init.c | 7 ++++--- include/asm-i386/page.h | 1 - 2 files changed, 4 insertions(+), 4 deletions(-)
arch/i386/mm/init.c +4 -3
@@ -471,6 +471,10 @@ void zap_low_mappings (void)flush_tlb_all (); } +int nx_enabled =0 ; + +#ifdef CONFIG_X86_PAE +static int disable_nx__initdata =0 ;u64 __supported_pte_mask__read_mostly = ~_PAGE_NX;
@@ -499,9 +503,6 @@ static int __init noexec_setup(char *str }early_param ("noexec" , noexec_setup); -int nx_enabled =0 ; -#ifdef CONFIG_X86_PAE -static void __init set_nx (void ) {unsigned int v[4 ], l, h;
include/asm-i386/page.h +0 -1
@@ -43,7 +43,6 @@extern int nx_enabled;#ifdef CONFIG_X86_PAE -extern unsigned long long __supported_pte_mask;typedef struct {unsigned long pte_low, pte_high; }pte_t ;typedef struct {unsigned long long pmd; }pmd_t ;typedef struct {unsigned long long pgd; }pgd_t ;