x86: fix section mismatch in reference from native_play_dead
PATCH 1/1 x86: fix section mismatch in reference from native_play_dead
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().
---
arch/x86/kernel/smpboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/smpboot.c +1 -1
@@ -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 );
Quoted 19 lines · Sergey Senozhatsky
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 functionnative_play_dead()references the function__cpuinitmwait_usable().Signed-off-by Sergey Senozhatsky <[email protected]>---
arch/x86/kernel/smpboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/x86/kernel/smpboot.c +0
-0
arch/x86/kernel/smpboot.c static inline void hlt_play_dead(void) · line 1473
Quoted 8 lines
arch/x86/kernel/smpboot.c +1
-1@@ -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
Quoted 1 line
From
1c9d16e35911090dee3f9313e6af13af623d66eeMon Sep 17 00:00:00 2001
From: Borislav Petkov <[email protected]>
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.
LKML-Reference: <20110211171754.GA21047@aftab>
--- arch/x86/include/asm/cpu.h | 2 +- arch/x86/kernel/process.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/cpu.h +1 -1
@@ -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 */
arch/x86/kernel/process.c +1 -1
@@ -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;
Hello,
Quoted 32 lines · Ingo Molnar
Quoted 19 lines · Sergey Senozhatsky
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 functionnative_play_dead()references the function__cpuinitmwait_usable().Signed-off-by Sergey Senozhatsky <[email protected]>---
arch/x86/kernel/smpboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/x86/kernel/smpboot.c +0
-0arch/x86/kernel/smpboot.c static inline void hlt_play_dead(void) · line 1473
Quoted 8 lines
arch/x86/kernel/smpboot.c +1
-1@@ -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?
[..]
Quoted 18 lines
arch/x86/include/asm/cpu.h +1
-1@@ -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 */ arch/x86/kernel/process.c +0
-0
arch/x86/kernel/process.c static void poll_idle(void) · line 512
Quoted 8 lines
arch/x86/kernel/process.c +1
-1@@ -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;
int mwait_usable(..)' is called from void __cpuinit select_idle_routine(...)'
I think we still have section mismatch in this case. Is it correct?
Sergey
Quoted 10 lines · Sergey Senozhatsky
arch/x86/kernel/process.c static void poll_idle(void) · line 511
Quoted 6 lines
arch/x86/kernel/process.c +1
-1-int __cpuinit mwait_usable (const struct cpuinfo_x86 *c) +int mwait_usable (const struct cpuinfo_x86 *c) {u32 eax, ebx, ecx, edx;
int mwait_usable(..)' is called fromvoid__cpuinitselect_idle_routine(...)'I think we still have section mismatch in this case. Is it correct?
Right, but mwait_usable() is not __cpuinit anymore and __cpuinit functions should be able to call other functions without annotation, methinks, no?
Signature · 8 lines
Regards/Gruss, Boris. Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach General Managers: Alberto Bozzo, Andrew Bowd Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
Quoted 4 lines · Borislav Petkov
Right, but
mwait_usable()is not__cpuinitanymore and__cpuinitfunctions should be able to call other functions without annotation, methinks, no?
Right,
Agreed, Borislav's fix is the correct one.
Thanks,
Sergey
Quoted 8 lines · Sergey Senozhatsky
Quoted 4 lines · Borislav Petkov
Right, but
mwait_usable()is not__cpuinitanymore and__cpuinitfunctions should be able to call other functions without annotation, methinks, no?Right,
Agreed, Borislav's fix is the correct one.
Ok, thanks guys!
Ingo