diff options
| -rw-r--r-- | arch/mips/kernel/irq.c | 2 | ||||
| -rw-r--r-- | arch/mips/sgi/kernel/indy_int.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index 7a779e2dd..39956dc0c 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c @@ -287,7 +287,7 @@ asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs) */ for (;;) { spin_unlock(&desc->lock); - handle_IRQ_event(irq, ®s, action); + handle_IRQ_event(irq, regs, action); spin_lock(&desc->lock); if (!(desc->status & IRQ_PENDING)) diff --git a/arch/mips/sgi/kernel/indy_int.c b/arch/mips/sgi/kernel/indy_int.c index 4acdcf253..c7d6e001d 100644 --- a/arch/mips/sgi/kernel/indy_int.c +++ b/arch/mips/sgi/kernel/indy_int.c @@ -129,6 +129,7 @@ static void enable_local1_irq(unsigned int irq) save_and_cli(flags); ioc_icontrol->imask1 |= (1 << (irq - SGINT_LOCAL1)); + restore_flags(flags); } static unsigned int startup_local1_irq(unsigned int irq) |