[Xen-changelog] [xen-unstable] Merge

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

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Node ID 8ff3287f4169fb2934a466920d646ac6ef64ca89
# Parent  0bbc1e003ef22399d24eb918507c7f5abe5b0bef
# Parent  c5538dc68542cc3282fb426c65761a842f07a1a2
Merge
---
 extras/mini-os/kernel.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -r 0bbc1e003ef2 -r 8ff3287f4169 extras/mini-os/kernel.c
--- a/extras/mini-os/kernel.c   Mon Nov 20 12:03:51 2006 +0000
+++ b/extras/mini-os/kernel.c   Mon Nov 20 12:05:25 2006 +0000
@@ -101,9 +101,6 @@ void start_kernel(start_info_t *si)
 
     trap_init();
 
-    /* ENABLE EVENT DELIVERY. This is disabled at start of day. */
-    __sti();
-    
     /* print out some useful information  */
     printk("Xen Minimal OS!\n");
     printk("start_info:   %p\n",    si);
@@ -119,6 +116,9 @@ void start_kernel(start_info_t *si)
     /* Set up events. */
     init_events();
     
+    /* ENABLE EVENT DELIVERY. This is disabled at start of day. */
+    __sti();
+
     arch_print_info();
 
     setup_xen_features();

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