Commit d5321abe authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

i386: minor nx handling adjustment 



Constrain __supported_pte_mask and NX handling to just the PAE kernel.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 09488165

arch/i386/mm/init.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

EXPORT_SYMBOL_GPL(__supported_pte_mask);
@@ -500,9 +504,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
Original line number Diff line number Diff line
@@ -44,7 +44,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;