Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=18fbef9e5242e146fe0264cf719a498785102841
Commit:     18fbef9e5242e146fe0264cf719a498785102841
Parent:     f034347470e486835ccdcd7a5bb2ceb417be11c4
Author:     Ingo Molnar <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 23:27:58 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 23:27:58 2008 +0100

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
 arch/x86/kernel/test_nx.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/test_nx.c b/arch/x86/kernel/test_nx.c
index 6d7ef11..ae0ef2e 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)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to