CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/01/05 22:29:21

Modified files:
        arch/mips/gt64120/ev64120: irq.c 
        arch/mips/jmr3927/rbhma3100: setup.c 
        arch/mips/tx4927/toshiba_rbtx4927: toshiba_rbtx4927_irq.c 
                                           toshiba_rbtx4927_setup.c 

Log message:
        Remove the last cli() calls.

diff -urN linux/arch/mips/gt64120/ev64120/irq.c 
linux/arch/mips/gt64120/ev64120/irq.c
--- linux/arch/mips/gt64120/ev64120/irq.c       2004/10/25 20:44:17     1.5
+++ linux/arch/mips/gt64120/ev64120/irq.c       2005/01/05 22:29:20     1.6
@@ -119,7 +119,7 @@
        /* Sets the exception_handler array. */
        set_except_vector(0, galileo_handle_int);
 
-       cli();
+       local_irq_disable();
 
        /*
         * Enable timer.  Other interrupts will be enabled as they are
diff -urN linux/arch/mips/jmr3927/rbhma3100/setup.c 
linux/arch/mips/jmr3927/rbhma3100/setup.c
--- linux/arch/mips/jmr3927/rbhma3100/setup.c   2004/11/21 19:32:20     1.15
+++ linux/arch/mips/jmr3927/rbhma3100/setup.c   2005/01/05 22:29:20     1.16
@@ -108,7 +108,7 @@
 
 static void jmr3927_machine_restart(char *command)
 {
-       cli();
+       local_irq_disable();
        puts("Rebooting...");
        do_reset();
 }
diff -urN linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c 
linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
--- linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c      
2004/11/12 03:10:46     1.10
+++ linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c      
2005/01/05 22:29:20     1.11
@@ -669,7 +669,7 @@
 {
        extern void tx4927_irq_init(void);
 
-       cli();
+       local_irq_disable();
 
        tx4927_irq_init();
        toshiba_rbtx4927_irq_ioc_init();
diff -urN linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c 
linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
--- linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c    
2004/11/12 03:10:46     1.13
+++ linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c    
2005/01/05 22:29:20     1.14
@@ -727,7 +727,7 @@
        reg_wr08(RBTX4927_SW_RESET_DO, RBTX4927_SW_RESET_DO_SET);
 
        /* do something passive while waiting for reset */
-       cli();
+       local_irq_disable();
        while (1)
                asm_wait();
 
@@ -738,7 +738,7 @@
 void toshiba_rbtx4927_halt(void)
 {
        printk(KERN_NOTICE "System Halted\n");
-       cli();
+       local_irq_disable();
        while (1) {
                asm_wait();
        }