direct-io.hg

changeset 7940:eaaee5f43c67

Mute error message on SMP resume if a secondary CPU is
already back online.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Mon Nov 21 15:06:49 2005 +0100 (2005-11-21)
parents 340effeb64b5
children 112a769787d2
files linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c	Mon Nov 21 14:48:31 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c	Mon Nov 21 15:06:49 2005 +0100
     1.3 @@ -189,17 +189,16 @@ static int __do_suspend(void *ignore)
     1.4  #endif
     1.5  
     1.6  	/* 
     1.7 -	** Only resume xenbus /after/ we've prepared our VCPUs; otherwise
     1.8 -	** the VCPU hotplug callback can race with our vcpu_prepare
     1.9 -	*/
    1.10 +	 * Only resume xenbus /after/ we've prepared our VCPUs; otherwise
    1.11 +	 * the VCPU hotplug callback can race with our vcpu_prepare
    1.12 +	 */
    1.13  	xenbus_resume();
    1.14  
    1.15 -
    1.16  #ifdef CONFIG_SMP
    1.17   out_reenable_cpus:
    1.18  	for_each_cpu_mask(i, prev_online_cpus) {
    1.19  		j = cpu_up(i);
    1.20 -		if (j != 0) {
    1.21 +		if ((j != 0) && !cpu_online(i)) {
    1.22  			printk(KERN_CRIT "Failed to bring cpu "
    1.23  			       "%d back up (%d).\n",
    1.24  			       i, j);