Messages in this thread Patch in this message | | | Date | Mon, 14 Feb 2011 13:51:55 GMT | From | tip-bot for Borislav Petkov <> | Subject | [tip:x86/urgent] x86: Fix mwait_usable section mismatch |
| |
Commit-ID: 1c9d16e35911090dee3f9313e6af13af623d66ee Gitweb: http://git.kernel.org/tip/1c9d16e35911090dee3f9313e6af13af623d66ee Author: Borislav Petkov <bp@amd64.org> AuthorDate: Fri, 11 Feb 2011 18:17:54 +0100 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Mon, 14 Feb 2011 12:08:28 +0100
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@amd.com> LKML-Reference: <20110211171754.GA21047@aftab> Signed-off-by: Ingo Molnar <mingo@elte.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;
| |