[Xen-changelog] More save/restore code in interrupts-enabled contest, where

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID f529cd119470032c2bc70b21432e733f9605727b
# Parent  1abbb6448b4a39c6a1a4d46c2d9a4389fdbe0b98
More save/restore code in interrupts-enabled contest, where
it properly belongs.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 1abbb6448b4a -r f529cd119470 
linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c       Thu Sep 29 
17:15:49 2005
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c       Thu Sep 29 
17:28:28 2005
@@ -129,6 +129,7 @@
     * race between pending interrupts and restoration of handler. 
     */
 #ifdef CONFIG_SMP
+       local_irq_enable(); /* XXX Needed for smp_resume(). Clean me up. */
        smp_resume();
 #endif
        cpu_set(smp_processor_id(), cpu_online_map);
diff -r 1abbb6448b4a -r f529cd119470 
linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
--- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c     Thu Sep 29 17:15:49 2005
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c     Thu Sep 29 17:28:28 2005
@@ -187,10 +187,6 @@
 
        irq_resume();
 
-       xencons_resume();
-
-       xenbus_resume();
-
        time_resume();
 
 #ifdef CONFIG_SMP
@@ -199,6 +195,10 @@
 #endif
 
        __sti();
+
+       xencons_resume();
+
+       xenbus_resume();
 
 #ifdef CONFIG_SMP
  out_reenable_cpus:

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