diff options
| author |   Finn Thain <fthain@telegraphics.com.au> | 2008-11-18 20:45:21 +0100 |
|---|---|---|
| committer |   Geert Uytterhoeven <geert@linux-m68k.org> | 2008-12-28 20:00:04 +0100 |
| commit | 746e8d3b223281f0e5472ab0ad8f59af2221ea9b (patch) | |
| tree | 47cd58b80407be264b5e55174771b674c2289de6 /arch/m68k/mac/macints.c | |
| parent | m68k: machw.h cleanup (diff) | |
| download | linux-dev-746e8d3b223281f0e5472ab0ad8f59af2221ea9b.tar.xz linux-dev-746e8d3b223281f0e5472ab0ad8f59af2221ea9b.zip | |
m68k: mac baboon interrupt enable/disable
No-one seems to know how to mask individual baboon interrupts, so we just
mask the umbrella IRQ. This will work as long as only the IDE driver uses
the baboon chip (it can't deadlock). Use mac_enable_irq/mac_disable_irq
rather than enable_irq/disable_irq because the latter routines count the
depth of nested calls which triggers a warning and call trace because
IRQ_NUBUS_C is enabled twice in a row (once when the baboon handler is
registered, and once when the IDE IRQ is registered).
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/m68k/mac/macints.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c index e17b8d56ce04..82e560c076ce 100644 --- a/arch/m68k/mac/macints.c +++ b/arch/m68k/mac/macints.c @@ -214,8 +214,8 @@ irqreturn_t mac_debug_handler(int, void *); /* #define DEBUG_MACINTS */ -static void mac_enable_irq(unsigned int irq); -static void mac_disable_irq(unsigned int irq); +void mac_enable_irq(unsigned int irq); +void mac_disable_irq(unsigned int irq); static struct irq_controller mac_irq_controller = { .name = "mac", @@ -274,7 +274,7 @@ void __init mac_init_IRQ(void) * These routines are just dispatchers to the VIA/OSS/PSC routines. */ -static void mac_enable_irq(unsigned int irq) +void mac_enable_irq(unsigned int irq) { int irq_src = IRQ_SRC(irq); @@ -307,7 +307,7 @@ static void mac_enable_irq(unsigned int irq) } } -static void mac_disable_irq(unsigned int irq) +void mac_disable_irq(unsigned int irq) { int irq_src = IRQ_SRC(irq); |