patch-2.4.0-test6 linux/arch/mips/orion/irq.c

Next file: linux/arch/mips/sgi/kernel/indy_int.c
Previous file: linux/arch/mips/mm/umap.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test5/linux/arch/mips/orion/irq.c linux/arch/mips/orion/irq.c
@@ -25,9 +25,6 @@
 
 void (*board_time_init)(struct irqaction *irq);
 extern asmlinkage void orionIRQ(void);
-irq_cpustat_t irq_stat [NR_CPUS];
-unsigned int local_bh_count[NR_CPUS];
-unsigned int local_irq_count[NR_CPUS];
 unsigned long spurious_count = 0;
 irq_desc_t irq_desc[NR_IRQS];
 
@@ -186,7 +183,7 @@
 
 	irq_exit(cpu);
 
-	if (softirq_state[cpu].active&softirq_state[cpu].mask)
+	if (softirq_active(cpu)&softirq_mask(cpu))
 		do_softirq();
 
 	/* unmasking and bottom half handling is done magically for us. */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)