---

yaml --- r: 287617 b: refs/heads/master c: 41bd956 h: refs/heads/master i: 287615: 98f07af v: v3
git-mirror · Feb 3, 2012 · 340a177 · 340a177
1 parent f4b29dd
commit 340a177
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b02aa1e6e7cf7d3bbf8027dc7e05e0eb2f1e828
+refs/heads/master: 41bd956de3dfdc3a43708fe2e0c8096c69064a1e
diff --git a/trunk/arch/x86/xen/smp.c b/trunk/arch/x86/xen/smp.c
@@ -409,6 +409,13 @@ static void __cpuinit xen_play_dead(void) /* used only with HOTPLUG_CPU */
 	play_dead_common();
 	HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);
 	cpu_bringup();
+	/*
+	 * Balance out the preempt calls - as we are running in cpu_idle
+	 * loop which has been called at bootup from cpu_bringup_and_idle.
+	 * The cpucpu_bringup_and_idle called cpu_bringup which made a
+	 * preempt_disable() So this preempt_enable will balance it out.
+	 */
+	preempt_enable();
 }
 
 #else /* !CONFIG_HOTPLUG_CPU */