patch-2.4.25 linux-2.4.25/include/asm-ppc64/hw_irq.h

• Lines: 25
• Date: 2004-02-18 05:36:32.000000000 -0800
• Orig file: linux-2.4.24/include/asm-ppc64/hw_irq.h
• Orig date: 2003-06-13 07:51:38.000000000 -0700

diff -urN linux-2.4.24/include/asm-ppc64/hw_irq.h linux-2.4.25/include/asm-ppc64/hw_irq.h
@@ -71,9 +71,21 @@
 
 #endif /* CONFIG_PPC_ISERIES */
 
-#define mask_irq(irq) ({if (irq_desc[irq].handler && irq_desc[irq].handler->disable) irq_desc[irq].handler->disable(irq);})
-#define unmask_irq(irq) ({if (irq_desc[irq].handler && irq_desc[irq].handler->enable) irq_desc[irq].handler->enable(irq);})
-#define ack_irq(irq) ({if (irq_desc[irq].handler && irq_desc[irq].handler->ack) irq_desc[irq].handler->ack(irq);})
+#define mask_irq(irq) ({ 				\
+	irq_desc_t *desc = irqdesc(irq);		\
+	if (desc->handler && desc->handler->disable)	\
+		desc->handler->disable(irq);		\
+})
+#define unmask_irq(irq) ({				\
+	irq_desc_t *desc = irqdesc(irq);		\
+	if (desc->handler && desc->handler->enable)	\
+		desc->handler->enable(irq);		\
+})
+#define ack_irq(irq) ({					\
+	irq_desc_t *desc = irqdesc(irq);		\
+	if (desc->handler && desc->handler->ack)	\
+		desc->handler->ack(irq);		\
+})
 
 /* Should we handle this via lost interrupts and IPIs or should we don't care like
  * we do now ? --BenH.