diff options
| author | Jan Beulich <jbeulich@novell.com> | 2007-07-21 17:10:26 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 18:37:09 -0700 |
| commit | d5321abe6abd16e1749ccd89636415d39611e138 (patch) | |
| tree | e9f845273999579fc59df27690ca3cc993c99de7 /arch/i386 | |
| parent | 09488165d5cc795a90b789c5657b1cbd279beb16 (diff) | |
| download | linux-d5321abe6abd16e1749ccd89636415d39611e138.tar.gz linux-d5321abe6abd16e1749ccd89636415d39611e138.tar.bz2 linux-d5321abe6abd16e1749ccd89636415d39611e138.zip | |
i386: minor nx handling adjustment
Constrain __supported_pte_mask and NX handling to just the PAE kernel.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/mm/init.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index 6e72f22e6bbd..e1a9a805c445 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c @@ -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; |