patch-2.1.101 linux/arch/mips/sgi/kernel/indy_int.c

• Lines: 93
• Date: Fri May 8 00:13:25 1998
• Orig file: v2.1.100/linux/arch/mips/sgi/kernel/indy_int.c
• Orig date: Wed Dec 10 10:31:10 1997

diff -u --recursive --new-file v2.1.100/linux/arch/mips/sgi/kernel/indy_int.c linux/arch/mips/sgi/kernel/indy_int.c
@@ -4,10 +4,10 @@
  *
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
  *
- * $Id: indy_int.c,v 1.4 1997/09/20 19:20:15 root Exp $
+ * $Id: indy_int.c,v 1.6 1998/05/01 01:35:15 ralf Exp $
  */
 #include <linux/config.h>
-
+#include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/kernel_stat.h>
 #include <linux/signal.h>
@@ -55,6 +55,7 @@
 extern void rs_kgdb_hook(int);
 #endif
 
+unsigned int local_bh_count[NR_CPUS];
 unsigned int local_irq_count[NR_CPUS];
 unsigned long spurious_count = 0;
 
@@ -230,7 +231,7 @@
 		if (!action) 
 			continue;
 		len += sprintf(buf+len, "%2d: %8d %c %s",
-			num, kstat.interrupts[num],
+			num, kstat.irqs[0][num],
 			(action->flags & SA_INTERRUPT) ? '+' : ' ',
 			action->name);
 		for (action=action->next; action; action = action->next) {
@@ -245,7 +246,7 @@
 		if (!action) 
 			continue;
 		len += sprintf(buf+len, "%2d: %8d %c %s",
-			num, kstat.interrupts[num],
+			num, kstat.irqs[0][num],
 			(action->flags & SA_INTERRUPT) ? '+' : ' ',
 			action->name);
 		for (action=action->next; action; action = action->next) {
@@ -274,7 +275,7 @@
 
 	cpu = smp_processor_id();
 	irq_enter(cpu, irq);
-	kstat.interrupts[irq]++;
+	kstat.irqs[0][irq]++;
 
 	printk("Got irq %d, press a key.", irq);
 	prom_getchar();
@@ -416,7 +417,7 @@
 	printk("Trying to free free IRQ%d\n",irq);
 }
 
-void init_IRQ(void)
+__initfunc(void init_IRQ(void))
 {
 	irq_setup();
 }
@@ -440,7 +441,7 @@
 	}
 
 	irq_enter(cpu, irq);
-	kstat.interrupts[irq + 16]++;
+	kstat.irqs[0][irq + 16]++;
 	action->handler(irq, action->dev_id, regs);
 	irq_exit(cpu, irq);
 }
@@ -464,7 +465,7 @@
 		action = local_irq_action[irq];
 	}
 	irq_enter(cpu, irq);
-	kstat.interrupts[irq + 24]++;
+	kstat.irqs[0][irq + 24]++;
 	action->handler(irq, action->dev_id, regs);
 	irq_exit(cpu, irq);
 }
@@ -475,7 +476,7 @@
 	int irq = 6;
 
 	irq_enter(cpu, irq);
-	kstat.interrupts[irq]++;
+	kstat.irqs[0][irq]++;
 	printk("Got a bus error IRQ, shouldn't happen yet\n");
 	show_regs(regs);
 	printk("Spinning...\n");
@@ -494,7 +495,7 @@
 	return 0;
 }
 
-void sgint_init(void)
+__initfunc(void sgint_init(void))
 {
 	int i;
 #ifdef CONFIG_REMOTE_DEBUG