aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/mac/macints.c
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2008-11-18 14:45:21 -0500
committerGeert Uytterhoeven <geert@linux-m68k.org>2008-12-28 14:00:04 -0500
commit746e8d3b223281f0e5472ab0ad8f59af2221ea9b (patch)
tree47cd58b80407be264b5e55174771b674c2289de6 /arch/m68k/mac/macints.c
parent429dbf53bca49b110f1058f0d9417a59115c41b8 (diff)
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 'arch/m68k/mac/macints.c')
-rw-r--r--arch/m68k/mac/macints.c8
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 *);
214 214
215/* #define DEBUG_MACINTS */ 215/* #define DEBUG_MACINTS */
216 216
217static void mac_enable_irq(unsigned int irq); 217void mac_enable_irq(unsigned int irq);
218static void mac_disable_irq(unsigned int irq); 218void mac_disable_irq(unsigned int irq);
219 219
220static struct irq_controller mac_irq_controller = { 220static struct irq_controller mac_irq_controller = {
221 .name = "mac", 221 .name = "mac",
@@ -274,7 +274,7 @@ void __init mac_init_IRQ(void)
274 * These routines are just dispatchers to the VIA/OSS/PSC routines. 274 * These routines are just dispatchers to the VIA/OSS/PSC routines.
275 */ 275 */
276 276
277static void mac_enable_irq(unsigned int irq) 277void mac_enable_irq(unsigned int irq)
278{ 278{
279 int irq_src = IRQ_SRC(irq); 279 int irq_src = IRQ_SRC(irq);
280 280
@@ -307,7 +307,7 @@ static void mac_enable_irq(unsigned int irq)
307 } 307 }
308} 308}
309 309
310static void mac_disable_irq(unsigned int irq) 310void mac_disable_irq(unsigned int irq)
311{ 311{
312 int irq_src = IRQ_SRC(irq); 312 int irq_src = IRQ_SRC(irq);
313 313