summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/test_nx.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-01-30 23:27:58 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 23:27:58 +0100
commit18fbef9e5242e146fe0264cf719a498785102841 (patch)
tree76eddf90c4deea73f1ba1ecdea5c4fc17aedafd0 /arch/x86/kernel/test_nx.c
parentf034347470e486835ccdcd7a5bb2ceb417be11c4 (diff)
downloadtalos-op-linux-18fbef9e5242e146fe0264cf719a498785102841.tar.gz
talos-op-linux-18fbef9e5242e146fe0264cf719a498785102841.zip
x86: fix arch/x86/kernel/test_nx.c modular build bug
fix this modular build bug: > CC [M] arch/x86/kernel/test_nx.o > {standard input}: Assembler messages: > {standard input}:58: Error: cannot represent relocation type BFD_RELOC_64 > {standard input}:59: Error: cannot represent relocation type BFD_RELOC_64 > make[2]: *** [arch/x86/kernel/test_nx.o] Error 1 > make[1]: *** [arch/x86/kernel] Error 2 Reported-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/test_nx.c')
-rw-r--r--arch/x86/kernel/test_nx.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/test_nx.c b/arch/x86/kernel/test_nx.c
index 6d7ef11e7975..ae0ef2e304c7 100644
--- a/arch/x86/kernel/test_nx.c
+++ b/arch/x86/kernel/test_nx.c
@@ -91,8 +91,13 @@ static noinline int test_address(void *address)
".previous\n"
".section __ex_table,\"a\"\n"
" .align 8\n"
+#ifdef CONFIG_X86_32
+ " .long 0b\n"
+ " .long 2b\n"
+#else
" .quad 0b\n"
" .quad 2b\n"
+#endif
".previous\n"
: [rslt] "=r" (result)
: [fake_code] "r" (address), [zero] "r" (0UL), "0" (result)
OpenPOWER on IntegriCloud