[PATCH -tip] x86: fix undefined linking reference of nx_enabled for 64 bit

[Jaswinder Singh Rajput <jaswinder@kernel.org>]

Subject: [PATCH] x86: fix undefined linking reference of nx_enabled for 64 bit

  LD      .tmp_vmlinux1
arch/x86/mm/built-in.o: In function `init_memory_mapping':
(.ref.text+0x73): undefined reference to `nx_enabled'
make: *** [.tmp_vmlinux1] Error 1

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
---
 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 acdfba8..9799a1c 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -49,6 +49,8 @@ static int __init noexec_setup(char *str)
 early_param("noexec", noexec_setup);
 #endif
 
+int nx_enabled;
+
 #ifdef CONFIG_X86_PAE
 static void __init set_nx(void)
 {
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 26a135f..a8458b9 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);
 
-- 
1.6.0.6