diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
| commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
| tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /arch/alpha/kernel/sys_sx164.c | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'arch/alpha/kernel/sys_sx164.c')
| -rw-r--r-- | arch/alpha/kernel/sys_sx164.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/alpha/kernel/sys_sx164.c b/arch/alpha/kernel/sys_sx164.c index 1219b9626..722b4f1a9 100644 --- a/arch/alpha/kernel/sys_sx164.c +++ b/arch/alpha/kernel/sys_sx164.c @@ -68,9 +68,6 @@ sx164_device_interrupt(unsigned long vector, struct pt_regs *regs) { unsigned long pld, tmp; unsigned int i; - unsigned long flags; - - save_and_cli(flags); /* Read the interrupt summary register of PYXIS */ pld = *(vulp)PYXIS_INT_REQ; @@ -101,14 +98,12 @@ sx164_device_interrupt(unsigned long vector, struct pt_regs *regs) *(vulp)PYXIS_INT_REQ = 1UL << i; mb(); tmp = *(vulp)PYXIS_INT_REQ; } - restore_flags(flags); } static void sx164_init_irq(void) { - outb(0, DMA1_RESET_REG); - outb(0, DMA2_RESET_REG); + STANDARD_INIT_IRQ_PROLOG; if (alpha_using_srm) { alpha_mv.update_irq_hw = sx164_srm_update_irq_hw; |