--- xeno-unstable.bk.bak/xen/common/kernel.c	2004-08-30 08:27:32.000000000 -0600
+++ xeno-unstable.bk/xen/common/kernel.c	2004-08-31 13:16:18.000000000 -0600
@@ -183,6 +183,9 @@
         }
     }
 
+    /* Must do this early -- e.g., spinlocks rely on get_current(). */
+    set_current(&idle0_task);
+
     /* We initialise the serial devices very early so we can get debugging. */
     serial_init_stage1();
 
@@ -218,8 +221,6 @@
         for ( ; ; ) ;
     }
 
-    set_current(&idle0_task);
-
     xenheap_phys_end = opt_xenheap_megabytes << 20;
 
     max_mem = max_page = (mbi->mem_upper+1024) >> (PAGE_SHIFT - 10);