Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/i386/mm/init.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

diff -puN arch/i386/mm/init.c~nx-267-rc2-bk2-ae-warning-fix arch/i386/mm/init.c
--- 25/arch/i386/mm/init.c~nx-267-rc2-bk2-ae-warning-fix	2004-06-02 18:27:16.385113112 -0700
+++ 25-akpm/arch/i386/mm/init.c	2004-06-02 18:31:17.564448280 -0700
@@ -413,7 +413,6 @@ extern void zone_sizes_init(void);
 
 static int disable_nx __initdata = 0;
 u64 __supported_pte_mask = ~_PAGE_NX;
-static int use_nx = 0;
 
 /*
  * noexec = on|off
@@ -437,6 +436,9 @@ static int __init noexec_setup(char *str
 
 __setup("noexec=", noexec_setup);
 
+#ifdef CONFIG_X86_PAE
+static int use_nx = 0;
+
 static void __init set_nx(void)
 {
 	unsigned int v[4], l, h;
@@ -452,6 +454,7 @@ static void __init set_nx(void)
 		}
 	}
 }
+#endif
 
 /*
  * paging_init() sets up the page tables - note that the first 8MB are
_