[Xen-changelog] merge?

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

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID df11e0709383f518b0c09ba50ec8d051170bb3c0
# Parent  5f39234a9ac433edfd4116fc973593b328edfb7e
# Parent  e21f101cc05497037572560b68d7a5e9fe234442
merge?

diff -r 5f39234a9ac4 -r df11e0709383 
linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c       Tue Aug 23 
18:09:54 2005
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c       Tue Aug 23 
18:10:21 2005
@@ -149,12 +149,12 @@
 
                        if (cpu_is_offline(cpu)) {
                                local_irq_disable();
+#if defined(CONFIG_XEN) && defined(CONFIG_HOTPLUG_CPU)
                                /* Ack it.  From this point on until
                                   we get woken up, we're not allowed
                                   to take any locks.  In particular,
                                   don't printk. */
                                __get_cpu_var(cpu_state) = CPU_DEAD;
-#if defined(CONFIG_XEN) && defined(CONFIG_HOTPLUG_CPU)
                                /* Tell hypervisor to take vcpu down. */
                                HYPERVISOR_vcpu_down(cpu);
 #endif

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