aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/cpu/common.c2
-rw-r--r--arch/x86/kernel/cpu/intel.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index ed05c7a0ca9b..4bd326d0322c 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)
499 499
500 /* Init Machine Check Exception if available. */ 500 /* Init Machine Check Exception if available. */
501 mcheck_init(c); 501 mcheck_init(c);
502
503 select_idle_routine(c);
502} 504}
503 505
504void __init identify_boot_cpu(void) 506void __init identify_boot_cpu(void)
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index f1136115279a..d1c372b018db 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)
137 } 137 }
138#endif 138#endif
139 139
140 select_idle_routine(c);
141 l2 = init_intel_cacheinfo(c); 140 l2 = init_intel_cacheinfo(c);
142 if (c->cpuid_level > 9 ) { 141 if (c->cpuid_level > 9 ) {
143 unsigned eax = cpuid_eax(10); 142 unsigned eax = cpuid_eax(10);