patch-2.3.35 linux/arch/ppc/kernel/irq.c

• Lines: 28
• Date: Mon Dec 27 14:10:20 1999
• Orig file: v2.3.34/linux/arch/ppc/kernel/irq.c
• Orig date: Sun Nov 7 16:37:34 1999

diff -u --recursive --new-file v2.3.34/linux/arch/ppc/kernel/irq.c linux/arch/ppc/kernel/irq.c
@@ -44,6 +44,7 @@
 #include <linux/openpic.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <linux/irq.h>
 
 #include <asm/bitops.h>
 #include <asm/hydra.h>
@@ -71,7 +72,7 @@
 
 #define NR_MASK_WORDS	((NR_IRQS + 31) / 32)
 
-struct irqdesc irq_desc[NR_IRQS] = {{0, 0}, };
+irq_desc_t irq_desc[NR_IRQS];
 int ppc_spurious_interrupts = 0;
 unsigned int ppc_local_bh_count[NR_CPUS];
 unsigned int ppc_local_irq_count[NR_CPUS];
@@ -244,8 +245,8 @@
 #else		
 		len += sprintf(buf+len, "%10u ", kstat_irqs(i));
 #endif /* __SMP__ */
-		if ( irq_desc[i].ctl )		
-			len += sprintf(buf+len, " %s ", irq_desc[i].ctl->typename );
+		if ( irq_desc[i].handler )		
+			len += sprintf(buf+len, " %s ", irq_desc[i].handler->typename );
 		else
 			len += sprintf(buf+len, "  None      ");
 		len += sprintf(buf+len, "    %s",action->name);