From: Andi Kleen Date: Wed, 30 Jan 2008 12:33:16 +0000 (+0100) Subject: x86: move MWAIT idle check to generic CPU initialization on 32-bit X-Git-Tag: v2.6.25-rc1~1143^2~260 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=30d432dfab2bcfd021d352e2058fae6b9405caeb;p=linux-2.6-omap-h63xx.git x86: move MWAIT idle check to generic CPU initialization on 32-bit Previously it was only run for Intel CPUs, but AMD Fam10h implements MWAIT too. This matches 64bit behaviour. Signed-off-by: Andi Kleen Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index ed05c7a0ca9..4bd326d0322 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -499,6 +499,8 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) /* Init Machine Check Exception if available. */ mcheck_init(c); + + select_idle_routine(c); } void __init identify_boot_cpu(void) diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index f1136115279..d1c372b018d 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -137,7 +137,6 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) } #endif - select_idle_routine(c); l2 = init_intel_cacheinfo(c); if (c->cpuid_level > 9 ) { unsigned eax = cpuid_eax(10);