[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1236354582.25265.1.camel@localhost.localdomain>
Date: Fri, 06 Mar 2009 21:19:42 +0530
From: Jaswinder Singh Rajput <jaswinder@...nel.org>
To: Ingo Molnar <mingo@...e.hu>, x86 maintainers <x86@...nel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH -tip] x86: fix undefined linking reference of nx_enabled
for 64 bit
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@...il.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists