diff --git a/[refs] b/[refs]
index 2b9eae7c1dd9..9836fe9e8fe3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09488165d5cc795a90b789c5657b1cbd279beb16
+refs/heads/master: d5321abe6abd16e1749ccd89636415d39611e138
diff --git a/trunk/arch/i386/mm/init.c b/trunk/arch/i386/mm/init.c
index 6e72f22e6bbd..e1a9a805c445 100644
--- a/trunk/arch/i386/mm/init.c
+++ b/trunk/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;
diff --git a/trunk/include/asm-i386/page.h b/trunk/include/asm-i386/page.h
index 99cf5d3692a9..80ecc66b6d86 100644
--- a/trunk/include/asm-i386/page.h
+++ b/trunk/include/asm-i386/page.h
@@ -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;