[Xen-changelog] Only resume xenbus /after/ we've prepared our VCPUs; otherwise the

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User smh22@xxxxxxxxxxxxxxxxxxxx
# Node ID 94d39d9acc8e900b533fca96b38702eb8a8bc279
# Parent  56d05708736ab4c8249627d25edfd0849f1a05fb
Only resume xenbus /after/ we've prepared our VCPUs; otherwise the 
VCPU hotplug callback can race with our vcpu_prepare. 

Signed-off-by: Steven Hand <steven@xxxxxxxxxxxxx>

diff -r 56d05708736a -r 94d39d9acc8e 
linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
--- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c     Fri Nov 18 18:25:17 2005
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c     Fri Nov 18 18:56:03 2005
@@ -182,12 +182,20 @@
 
        xencons_resume();
 
-       xenbus_resume();
-
 #ifdef CONFIG_SMP
        for_each_cpu(i)
                vcpu_prepare(i);
 
+#endif
+
+       /* 
+       ** Only resume xenbus /after/ we've prepared our VCPUs; otherwise
+       ** the VCPU hotplug callback can race with our vcpu_prepare
+       */
+       xenbus_resume();
+
+
+#ifdef CONFIG_SMP
  out_reenable_cpus:
        for_each_cpu_mask(i, prev_online_cpus) {
                j = cpu_up(i);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog