[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20080411175006.GA31716@uranus.ravnborg.org>
Date: Fri, 11 Apr 2008 19:50:06 +0200
From: Sam Ravnborg <sam@...nborg.org>
To: Jacek Luczak <difrost.kernel@...il.com>
Cc: Ingo Molnar <mingo@...e.hu>, LKML <linux-kernel@...r.kernel.org>,
tglx@...utronix.de
Subject: Re: [PATCH] x86: setup_trampoline() - fix section mismatch warning
Hi Jacek
On Thu, Apr 10, 2008 at 09:16:41PM +0200, Jacek Luczak wrote:
> Hi Ingo,
>
> this patch fixes section mismatch warnings (on x86_64 host) in setup_trampoline(),
> which was referencing __initdata variables trampoline_data and trampoline_end.
>
> Patch is against x86/latest.
>
> Warning messages:
> WARNING: arch/x86/kernel/built-in.o(.cpuinit.text+0x2b6a): Section mismatch in reference from the function setup_trampoline()
> to the variable .init.data:trampoline_data
> The function __cpuinit setup_trampoline() references
> a variable __initdata trampoline_data.
> If trampoline_data is only used by setup_trampoline then
> annotate trampoline_data with a matching annotation.
>
> WARNING: arch/x86/kernel/built-in.o(.cpuinit.text+0x2b71): Section mismatch in reference from the function setup_trampoline()
> to the variable .init.data:trampoline_end
> The function __cpuinit setup_trampoline() references
> a variable __initdata trampoline_end.
> If trampoline_end is only used by setup_trampoline then
> annotate trampoline_end with a matching annotation.
>
> -Jacek
>
> PS: Hope that my email client won't break patch this time. In case it does - patch attached.
>
> ---
>
> diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
> index 4aedd0b..2a07e67 100644
> --- a/arch/x86/kernel/trampoline_64.S
> +++ b/arch/x86/kernel/trampoline_64.S
> @@ -32,7 +32,7 @@
>
> /* We can free up trampoline after bootup if cpu hotplug is not supported. */
> #ifndef CONFIG_HOTPLUG_CPU
> -.section .init.data, "aw", @progbits
> +.section .cpuinit.data, "aw", @progbits
> #else
> .section .rodata, "a", @progbits
> #endif
The correct fix would be to drop the
preprocessor directves and use __CPUINITDATA
Like this: (hand edited):
> diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
> index 4aedd0b..2a07e67 100644
> --- a/arch/x86/kernel/trampoline_64.S
> +++ b/arch/x86/kernel/trampoline_64.S
> @@ -32,7 +32,7 @@
>
> /* We can free up trampoline after bootup if cpu hotplug is not supported. */
> #ifndef CONFIG_HOTPLUG_CPU
> -.section .init.data, "aw", @progbits
> -#else
> -.section .rodata, "a", @progbits
> -#endif
> +__CPUINITDATA
If your testing confirms this then please apply similar fix to the _32.S
version of the file too.
Nore that this looses the @progbits annotation but it should be OK to do so.
I may later add it to init.h.
Sam
--
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