2.6.35-rc1 regression with pvclock and smp guests

Commit Message

Zachary Amsden Oct. 2, 2010, 5:35 a.m. UTC

None

Patch

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 8b3bfc4..40a383b 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -351,6 +351,8 @@  notrace static void __cpuinit start_secondary(void *unused)
 	unlock_vector_lock();
 	ipi_call_unlock();
 	per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
+	x86_cpuinit.setup_percpu_clockev();
+
 	x86_platform.nmi_init();
 
 	/* enable local interrupts */
@@ -359,8 +361,6 @@  notrace static void __cpuinit start_secondary(void *unused)
 	/* to prevent fake stack check failure in clock setup */
 	boot_init_stack_canary();
 
-	x86_cpuinit.setup_percpu_clockev();
-
 	wmb();
 	cpu_idle();
 }