Skip to contentSkip to conversation

x86: fix arch/x86/kernel/test_nx.c modular build bug

DISCUSSION Sam Ravnborg 2 participants 3 messages Feb 2, 2008 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 30 lines · Linux Kernel Mailing List
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

---
 arch/x86/kernel/test_nx.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
arch/x86/kernel/test_nx.c +0 -0
index 6d7ef11..ae0ef2e 100644

arch/x86/kernel/test_nx.c static noinline int test_address(void *address) · line 100

Quoted 10 lines
arch/x86/kernel/test_nx.c +5 -0
@@ -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

This should have used _ASM_PTR from asm.h:

#ifdef CONFIG_X86_32
/* 32 bits */

# define _ASM_PTR       " .long "
...
#else
/* 64 bits */
# define _ASM_PTR       " .quad "

Sam

#2 lore raw
Quoted 6 lines · Sam Ravnborg

This should have used _ASM_PTR from asm.h:

#ifdef CONFIG_X86_32
/* 32 bits */

Quoted 7 lines
# define _ASM_PTR       " .long "
...
#else
/* 64 bits */
# define _ASM_PTR       " .quad "

There is an even better patch now in upstream.

-hpa

#3 lore raw
Quoted 3 lines · H. Peter Anvin

There is an even better patch now in upstream.

Sorry, not in upstream; *queued* for upstream (in x86.git#master).

-hpa