summaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/sys_noritake.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-09-19 19:15:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-09-19 19:15:08 +0000
commit03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch)
tree88db8dba75ae06ba3bad08e42c5e52efc162535c /arch/alpha/kernel/sys_noritake.c
parent257730f99381dd26e10b832fce4c94cae7ac1176 (diff)
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'arch/alpha/kernel/sys_noritake.c')
-rw-r--r--arch/alpha/kernel/sys_noritake.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/alpha/kernel/sys_noritake.c b/arch/alpha/kernel/sys_noritake.c
index c8901ae2f..2ade29654 100644
--- a/arch/alpha/kernel/sys_noritake.c
+++ b/arch/alpha/kernel/sys_noritake.c
@@ -53,9 +53,6 @@ noritake_device_interrupt(unsigned long vector, struct pt_regs *regs)
{
unsigned long pld;
unsigned int i;
- unsigned long flags;
-
- save_and_cli(flags);
/* Read the interrupt summary registers of NORITAKE */
pld = ((unsigned long) inw(0x54c) << 32) |
@@ -76,16 +73,13 @@ noritake_device_interrupt(unsigned long vector, struct pt_regs *regs)
handle_irq(i, i, regs);
}
}
- restore_flags(flags);
}
static void
noritake_srm_device_interrupt(unsigned long vector, struct pt_regs * regs)
{
int irq, ack;
- unsigned long flags;
- __save_and_cli(flags);
ack = irq = (vector - 0x800) >> 4;
/*
@@ -101,7 +95,6 @@ noritake_srm_device_interrupt(unsigned long vector, struct pt_regs * regs)
ack = irq = irq + 1;
handle_irq(irq, ack, regs);
- __restore_flags(flags);
}
static void __init