[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110214122550.GA15860@elte.hu>
Date: Mon, 14 Feb 2011 13:25:50 +0100
From: Ingo Molnar <mingo@...e.hu>
To: Sergey Senozhatsky <sergey.senozhatsky@...il.com>
Cc: Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>,
"H. Peter Anvin" <hpa@...or.com>, x86@...nel.org,
Tejun Heo <tj@...nel.org>,
Borislav Petkov <borislav.petkov@....com>,
Suresh Siddha <suresh.b.siddha@...el.com>,
linux-kernel@...r.kernel.org, Borislav Petkov <bp@...64.org>
Subject: Re: [PATCH] x86: fix section mismatch in reference from
native_play_dead
* Sergey Senozhatsky <sergey.senozhatsky@...il.com> wrote:
> Fix
>
> WARNING: arch/x86/kernel/built-in.o(.text+0x19cde): Section mismatch in reference from
> the function native_play_dead() to the function .cpuinit.text:mwait_usable()
> The function native_play_dead() references the function __cpuinit mwait_usable().
>
>
> Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@...il.com>
>
> ---
>
> arch/x86/kernel/smpboot.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
> index 0cbe8c0..0b8c6c9 100644
> --- a/arch/x86/kernel/smpboot.c
> +++ b/arch/x86/kernel/smpboot.c
> @@ -1467,7 +1467,7 @@ static inline void hlt_play_dead(void)
> }
> }
>
> -void native_play_dead(void)
> +void __cpuinit native_play_dead(void)
> {
> play_dead_common();
> tboot_shutdown(TB_SHUTDOWN_WFS);
I think the right fix is Boris's fix below. Agreed?
Thanks,
Ingo
>From 1c9d16e35911090dee3f9313e6af13af623d66ee Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@...64.org>
Date: Fri, 11 Feb 2011 18:17:54 +0100
Subject: [PATCH] x86: Fix mwait_usable section mismatch
We use it in non __cpuinit code now too so drop marker.
Signed-off-by: Borislav Petkov <borislav.petkov@....com>
LKML-Reference: <20110211171754.GA21047@...ab>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/include/asm/cpu.h | 2 +-
arch/x86/kernel/process.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
index 6e6e755..4564c8e 100644
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@ -32,6 +32,6 @@ extern void arch_unregister_cpu(int);
DECLARE_PER_CPU(int, cpu_state);
-int __cpuinit mwait_usable(const struct cpuinfo_x86 *);
+int mwait_usable(const struct cpuinfo_x86 *);
#endif /* _ASM_X86_CPU_H */
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index e764fc0..3c189e9 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -506,7 +506,7 @@ static void poll_idle(void)
#define MWAIT_ECX_EXTENDED_INFO 0x01
#define MWAIT_EDX_C1 0xf0
-int __cpuinit mwait_usable(const struct cpuinfo_x86 *c)
+int mwait_usable(const struct cpuinfo_x86 *c)
{
u32 eax, ebx, ecx, edx;
--
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