diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
| commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
| tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /arch/alpha/kernel/sys_mikasa.c | |
| parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) | |
Merge with Linux 2.3.49.
Diffstat (limited to 'arch/alpha/kernel/sys_mikasa.c')
| -rw-r--r-- | arch/alpha/kernel/sys_mikasa.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/alpha/kernel/sys_mikasa.c b/arch/alpha/kernel/sys_mikasa.c index 936fa4f17..a66731154 100644 --- a/arch/alpha/kernel/sys_mikasa.c +++ b/arch/alpha/kernel/sys_mikasa.c @@ -48,7 +48,7 @@ mikasa_enable_irq(unsigned int irq) mikasa_update_irq_hw(cached_irq_mask |= 1 << (irq - 16)); } -static inline void +static void mikasa_disable_irq(unsigned int irq) { mikasa_update_irq_hw(cached_irq_mask &= ~(1 << (irq - 16))); @@ -61,6 +61,13 @@ mikasa_startup_irq(unsigned int irq) return 0; } +static void +mikasa_end_irq(unsigned int irq) +{ + if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) + mikasa_enable_irq(irq); +} + static struct hw_interrupt_type mikasa_irq_type = { typename: "MIKASA", startup: mikasa_startup_irq, @@ -68,7 +75,7 @@ static struct hw_interrupt_type mikasa_irq_type = { enable: mikasa_enable_irq, disable: mikasa_disable_irq, ack: mikasa_disable_irq, - end: mikasa_enable_irq, + end: mikasa_end_irq, }; static void @@ -108,12 +115,11 @@ mikasa_init_irq(void) mikasa_update_irq_hw(0); for (i = 16; i < 32; ++i) { - irq_desc[i].status = IRQ_DISABLED; + irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; irq_desc[i].handler = &mikasa_irq_type; } init_i8259a_irqs(); - init_rtc_irq(); common_init_isa_dma(); } |