ia64/xen-unstable

changeset 3857:ca98a0eeb6b1

bitkeeper revision 1.1221 (42152386hyIe9n6VsIczTLskp4VGvg)

xensetup.c:
Rename cli/sti to local_irq_disable/enable
author adsharma@linux-t08.sc.intel.com
date Thu Feb 17 23:06:46 2005 +0000 (2005-02-17)
parents 6d61bb88d482
children 0a8144360a21 c17fa9eea8c5
files BitKeeper/etc/logging_ok xen/arch/ia64/xensetup.c
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Thu Feb 17 20:35:08 2005 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Thu Feb 17 23:06:46 2005 +0000
     1.3 @@ -1,6 +1,7 @@
     1.4  ach61@boulderdash.cl.cam.ac.uk
     1.5  ach61@labyrinth.cl.cam.ac.uk
     1.6  ach61@soar.cl.cam.ac.uk
     1.7 +adsharma@linux-t08.sc.intel.com
     1.8  akw27@arcadians.cl.cam.ac.uk
     1.9  akw27@boulderdash.cl.cam.ac.uk
    1.10  akw27@labyrinth.cl.cam.ac.uk
     2.1 --- a/xen/arch/ia64/xensetup.c	Thu Feb 17 20:35:08 2005 +0000
     2.2 +++ b/xen/arch/ia64/xensetup.c	Thu Feb 17 23:06:46 2005 +0000
     2.3 @@ -20,7 +20,6 @@
     2.4  //#include <xen/console.h>
     2.5  //#include <xen/serial.h>
     2.6  #include <xen/trace.h>
     2.7 -#include <linux/interrupt.h>
     2.8  //#include <asm/shadow.h>
     2.9  //#include <asm/io.h>
    2.10  //#include <asm/uaccess.h>
    2.11 @@ -281,7 +280,7 @@ void cmain(multiboot_info_t *mbi)
    2.12  			SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
    2.13  printk("About to call scheduler_init()\n");
    2.14      scheduler_init();
    2.15 -    cli();
    2.16 +    local_irq_disable();
    2.17  printk("About to call time_init()\n");
    2.18      time_init();
    2.19  printk("About to call ac_timer_init()\n");
    2.20 @@ -401,7 +400,7 @@ printk("About to call init_trace_bufs()\
    2.21  #endif
    2.22      domain_unpause_by_systemcontroller(dom0);
    2.23      domain0_ready = 1;
    2.24 -    sti();
    2.25 +    local_irq_enable();
    2.26  printk("About to call startup_cpu_idle_loop()\n");
    2.27      startup_cpu_idle_loop();
    2.28  }