[Xen-changelog] Mute error message on SMP resume if a secondary CPU is

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID eaaee5f43c6776400b2a59b71cdfb9351b1ebcf6
# Parent  340effeb64b56b231cb4c2f0d7da8f78504198ee
Mute error message on SMP resume if a secondary CPU is
already back online.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 340effeb64b5 -r eaaee5f43c67 
linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
--- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c     Mon Nov 21 13:48:31 2005
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c     Mon Nov 21 14:06:49 2005
@@ -189,17 +189,16 @@
 #endif
 
        /* 
-       ** Only resume xenbus /after/ we've prepared our VCPUs; otherwise
-       ** the VCPU hotplug callback can race with our vcpu_prepare
-       */
+        * 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);
-               if (j != 0) {
+               if ((j != 0) && !cpu_online(i)) {
                        printk(KERN_CRIT "Failed to bring cpu "
                               "%d back up (%d).\n",
                               i, j);

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