From d44e14491d95823695ee6d3ce5cdf4004b7953bb Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Wed, 30 Jan 2008 13:33:16 +0100
Subject: [PATCH] --- yaml --- r: 80315 b: refs/heads/master c:
 30d432dfab2bcfd021d352e2058fae6b9405caeb h: refs/heads/master i:   80313:
 c5aad1531e55abd1c1c0c2d29fc75ded42d2224e   80311:
 e8e603fb76128851157de4349bc409047f7deebc v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/cpu/common.c | 2 ++
 trunk/arch/x86/kernel/cpu/intel.c  | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index de3ec678c337..e0007738d6eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6e8e28410c017adb273983057023a17a8791ad3
+refs/heads/master: 30d432dfab2bcfd021d352e2058fae6b9405caeb
diff --git a/trunk/arch/x86/kernel/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c
index ed05c7a0ca9b..4bd326d0322c 100644
--- a/trunk/arch/x86/kernel/cpu/common.c
+++ b/trunk/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/trunk/arch/x86/kernel/cpu/intel.c b/trunk/arch/x86/kernel/cpu/intel.c
index f1136115279a..d1c372b018db 100644
--- a/trunk/arch/x86/kernel/cpu/intel.c
+++ b/trunk/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);