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

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

[Sam Ravnborg]

On Thu, Jan 31, 2008 at 01:59:30AM +0000, Linux Kernel Mailing List wrote:
> 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 <mingo@elte.hu>
> AuthorDate: Wed Jan 30 23:27:58 2008 +0100
> Committer:  Ingo Molnar <mingo@elte.hu>
> 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 <bunk@kernel.org>
>     Signed-off-by: Ingo Molnar <mingo@elte.hu>
> ---
>  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

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

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

[H. Peter Anvin]

Sam Ravnborg wrote:
> 
> 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 "
> 

There is an even better patch now in upstream.

	-hpa

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

[H. Peter Anvin]

H. Peter Anvin wrote:
> 
> There is an even better patch now in upstream.
> 

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

	-hpa