diff options
Diffstat (limited to 'arch/i386/mm/init.c')
-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) | |||
471 | flush_tlb_all(); | 471 | flush_tlb_all(); |
472 | } | 472 | } |
473 | 473 | ||
474 | int nx_enabled = 0; | ||
475 | |||
476 | #ifdef CONFIG_X86_PAE | ||
477 | |||
474 | static int disable_nx __initdata = 0; | 478 | static int disable_nx __initdata = 0; |
475 | u64 __supported_pte_mask __read_mostly = ~_PAGE_NX; | 479 | u64 __supported_pte_mask __read_mostly = ~_PAGE_NX; |
476 | EXPORT_SYMBOL_GPL(__supported_pte_mask); | 480 | EXPORT_SYMBOL_GPL(__supported_pte_mask); |
@@ -500,9 +504,6 @@ static int __init noexec_setup(char *str) | |||
500 | } | 504 | } |
501 | early_param("noexec", noexec_setup); | 505 | early_param("noexec", noexec_setup); |
502 | 506 | ||
503 | int nx_enabled = 0; | ||
504 | #ifdef CONFIG_X86_PAE | ||
505 | |||
506 | static void __init set_nx(void) | 507 | static void __init set_nx(void) |
507 | { | 508 | { |
508 | unsigned int v[4], l, h; | 509 | unsigned int v[4], l, h; |