ia64/xen-unstable

changeset 6374:df11e0709383

merge?
author cl349@firebug.cl.cam.ac.uk
date Tue Aug 23 18:10:21 2005 +0000 (2005-08-23)
parents 5f39234a9ac4 e21f101cc054
children 522bc50588ed
files linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c linux-2.6-xen-sparse/drivers/xen/blkback/common.h linux-2.6-xen-sparse/drivers/xen/blkback/interface.c linux-2.6-xen-sparse/drivers/xen/blkback/vbd.c linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c	Tue Aug 23 18:09:54 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c	Tue Aug 23 18:10:21 2005 +0000
     1.3 @@ -149,12 +149,12 @@ void cpu_idle (void)
     1.4  
     1.5  			if (cpu_is_offline(cpu)) {
     1.6  				local_irq_disable();
     1.7 +#if defined(CONFIG_XEN) && defined(CONFIG_HOTPLUG_CPU)
     1.8  				/* Ack it.  From this point on until
     1.9  				   we get woken up, we're not allowed
    1.10  				   to take any locks.  In particular,
    1.11  				   don't printk. */
    1.12  				__get_cpu_var(cpu_state) = CPU_DEAD;
    1.13 -#if defined(CONFIG_XEN) && defined(CONFIG_HOTPLUG_CPU)
    1.14  				/* Tell hypervisor to take vcpu down. */
    1.15  				HYPERVISOR_vcpu_down(cpu);
    1.16  #endif