[tip:x86/mm] x86: unify noexec handling, fix

[Ingo Molnar <mingo@elte.hu>]

Commit-ID:  4b809e98a7f9d88e2cb9574f41efa015844c1470
Gitweb:     http://git.kernel.org/tip/4b809e98a7f9d88e2cb9574f41efa015844c1470
Author:     "Ingo Molnar" <mingo@elte.hu>
AuthorDate: Fri, 6 Mar 2009 15:37:07 +0100
Commit:     Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 6 Mar 2009 15:37:07 +0100

x86: unify noexec handling, fix

Impact: build fix

Move the nx_enabled variable to mm/init.c too.

Cc: Pekka Enberg <penberg@cs.helsinki.fi>
LKML-Reference: <1236265498.31324.12.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>


---
 arch/x86/mm/init.c    |    2 ++
 arch/x86/mm/init_32.c |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index e7d8bb5..75e3825 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -25,6 +25,8 @@ int direct_gbpages
 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
 static int disable_nx __initdata;
 
+int nx_enabled;
+
 /*
  * noexec = on|off
  *
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 8ff1173..07bfd60 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -587,8 +587,6 @@ void zap_low_mappings(void)
 	flush_tlb_all();
 }
 
-int nx_enabled;
-
 pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
 EXPORT_SYMBOL_GPL(__supported_pte_mask);