2005-01-04 22:36:43

by James Nelson

Subject: [PATCH 0/4] mips: remove cli()/sti() from arch/mips/*

This series of patches is to remove the last cli()/sti() function calls in arch/mips.

These are the only instances in active code that grep could find.

gt64120/ev64120/irq.c | 2 +-
jmr3927/rbhma3100/setup.c | 2 +-
tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | 2 +-
tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)

2005-01-04 22:36:45

by James Nelson

Subject: [PATCH 2/4] mips: remove cli()/sti() in arch/mips/jmr3927/rbhma3100/setup.c

Signed-off-by: James Nelson <[email protected]>

diff -urN --exclude='*~' linux-2.6.10-mm1-original/arch/mips/jmr3927/rbhma3100/setup.c linux-2.6.10-mm1/arch/mips/jmr3927/rbhma3100/setup.c
--- linux-2.6.10-mm1-original/arch/mips/jmr3927/rbhma3100/setup.c 2005-01-03 18:42:40.230471006 -0500
+++ linux-2.6.10-mm1/arch/mips/jmr3927/rbhma3100/setup.c 2005-01-04 16:50:40.966286806 -0500
@@ -108,7 +108,7 @@

static void jmr3927_machine_restart(char *command)
{
- cli();
+ local_irq_disable();
puts("Rebooting...");
do_reset();
}

2005-01-04 22:36:44

by James Nelson

Subject: [PATCH 1/4] mips: remove cli()/sti() in arch/mips/gt64120/ev64120/irq.c

Signed-off-by: James Nelson <[email protected]>

diff -urN --exclude='*~' linux-2.6.10-mm1-original/arch/mips/gt64120/ev64120/irq.c linux-2.6.10-mm1/arch/mips/gt64120/ev64120/irq.c
--- linux-2.6.10-mm1-original/arch/mips/gt64120/ev64120/irq.c 2005-01-03 18:42:40.217472760 -0500
+++ linux-2.6.10-mm1/arch/mips/gt64120/ev64120/irq.c 2005-01-04 16:49:18.217458194 -0500
@@ -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

2005-01-04 22:49:19

by James Nelson

Subject: [PATCH 4/4] mips: remove cli()/sti() in arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c

Signed-off-by: James Nelson <[email protected]>

diff -urN --exclude='*~' linux-2.6.10-mm1-original/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c linux-2.6.10-mm1/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
--- linux-2.6.10-mm1-original/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c 2004-12-24 16:35:00.000000000 -0500
+++ linux-2.6.10-mm1/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c 2005-01-04 16:55:45.501173508 -0500
@@ -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();
}

2005-01-04 22:49:18

by James Nelson

Subject: [PATCH 3/4] mips: remove cli()/sti() in arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c

Signed-off-by: James Nelson <[email protected]>

diff -urN --exclude='*~' linux-2.6.10-mm1-original/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c linux-2.6.10-mm1/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
--- linux-2.6.10-mm1-original/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c 2004-12-24 16:34:30.000000000 -0500
+++ linux-2.6.10-mm1/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c 2005-01-04 16:55:42.122629623 -0500
@@ -669,7 +669,7 @@
{
extern void tx4927_irq_init(void);

- cli();
+ local_irq_disable();

tx4927_irq_init();
toshiba_rbtx4927_irq_ioc_init();

2005-01-05 22:29:08

by Ralf Baechle

Subject: Re: [PATCH 0/4] mips: remove cli()/sti() from arch/mips/*

On Tue, Jan 04, 2005 at 04:33:07PM -0600, James Nelson wrote:

> This series of patches is to remove the last cli()/sti() function calls in arch/mips.
>
> These are the only instances in active code that grep could find.
>
> gt64120/ev64120/irq.c | 2 +-
> jmr3927/rbhma3100/setup.c | 2 +-
> tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | 2 +-
> tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | 4 ++--

The usual suspects for bitrot ...

Thanks, all four patches applied.

Ralf