bitkeeper revision 1.1221 (42152386hyIe9n6VsIczTLskp4VGvg)

xensetup.c:
  Rename cli/sti to local_irq_disable/enable

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index cc61e097c9008fb184ca99d056f656bf53e26a2d..35236489aa011e41938a1e2a8887fddce0e32c6e 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,6 +1,7 @@
 ach61@boulderdash.cl.cam.ac.uk
 ach61@labyrinth.cl.cam.ac.uk
 ach61@soar.cl.cam.ac.uk
+adsharma@linux-t08.sc.intel.com
 akw27@arcadians.cl.cam.ac.uk
 akw27@boulderdash.cl.cam.ac.uk
 akw27@labyrinth.cl.cam.ac.uk

diff --git a/xen/arch/ia64/xensetup.c b/xen/arch/ia64/xensetup.c
index 5515b3bf340d35cad47bf84afbcaf126378c5a42..e8d779ecc1f4f7ca89ac413dc8c8b45cb6aa01ff 100644 (file)
--- a/xen/arch/ia64/xensetup.c
+++ b/xen/arch/ia64/xensetup.c
@@ -20,7 +20,6 @@
 //#include <xen/console.h>
 //#include <xen/serial.h>
 #include <xen/trace.h>
-#include <linux/interrupt.h>
 //#include <asm/shadow.h>
 //#include <asm/io.h>
 //#include <asm/uaccess.h>
@@ -281,7 +280,7 @@ void cmain(multiboot_info_t *mbi)
                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
 printk("About to call scheduler_init()\n");
     scheduler_init();
-    cli();
+    local_irq_disable();
 printk("About to call time_init()\n");
     time_init();
 printk("About to call ac_timer_init()\n");
@@ -401,7 +400,7 @@ printk("About to call init_trace_bufs()\n");
 #endif
     domain_unpause_by_systemcontroller(dom0);
     domain0_ready = 1;
-    sti();
+    local_irq_enable();
 printk("About to call startup_cpu_idle_loop()\n");
     startup_cpu_idle_loop();
 }