2008-11-20 13:08:58

by Rakib Mullick

Subject: [PATCH 1/2] x86: Fixing __cpuinit/__init tangle.

Impact: Fixing __cpuinit/__init tangle.

This patch removes the following section mismatch warning. A patch set
was send previously (http://lkml.org/lkml/2008/11/10/407). But
introduce some other problem, reported by Rufus
(http://lkml.org/lkml/2008/11/11/46). Then Ingo Molnar suggest that,
it's best to remove __init from xsave_cntxt_init(void). Which is the
second patch in this series. Now, this one removes the following
warning.

WARNING: arch/x86/kernel/built-in.o(.cpuinit.text+0x2237): Section
mismatch in reference from the function cpu_init() to the function
.init.text:init_thread_xstate()
The function __cpuinit cpu_init() references
a function __init init_thread_xstate().
If init_thread_xstate is only used by cpu_init then
annotate init_thread_xstate with a matching annotation.

Thanks.

Signed-off-by: Rakib Mullick <[email protected]>

--- linux-2.6-orig/arch/x86/kernel/i387.c 2008-11-17 20:30:12.000000000 +0600
+++ linux-2.6/arch/x86/kernel/i387.c 2008-11-19 05:44:48.000000000 +0600
@@ -58,7 +58,7 @@ void __cpuinit mxcsr_feature_mask_init(v
stts();
}

-void __init init_thread_xstate(void)
+void __cpuinit init_thread_xstate(void)
{
if (!HAVE_HWFP) {
xstate_size = sizeof(struct i387_soft_struct);

2008-11-20 15:44:16

by Ingo Molnar

Subject: Re: [PATCH 1/2] x86: Fixing __cpuinit/__init tangle.

* Rakib Mullick <[email protected]> wrote:

> Impact: Fixing __cpuinit/__init tangle.
>
> This patch removes the following section mismatch warning. A patch set
> was send previously (http://lkml.org/lkml/2008/11/10/407). But
> introduce some other problem, reported by Rufus
> (http://lkml.org/lkml/2008/11/11/46). Then Ingo Molnar suggest that,
> it's best to remove __init from xsave_cntxt_init(void). Which is the
> second patch in this series. Now, this one removes the following
> warning.
>
> WARNING: arch/x86/kernel/built-in.o(.cpuinit.text+0x2237): Section
> mismatch in reference from the function cpu_init() to the function
> .init.text:init_thread_xstate()
> The function __cpuinit cpu_init() references
> a function __init init_thread_xstate().
> If init_thread_xstate is only used by cpu_init then
> annotate init_thread_xstate with a matching annotation.
>
> Thanks.

applied to tip/x86/urgent, thanks Rakib!

Ingo