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

• Lines: 98
• Date: Thu Feb 24 22:52:30 2000
• Orig file: v2.3.47/linux/arch/mips/sgi/kernel/indy_int.c
• Orig date: Tue Aug 31 17:29:12 1999

diff -u --recursive --new-file v2.3.47/linux/arch/mips/sgi/kernel/indy_int.c linux/arch/mips/sgi/kernel/indy_int.c
@@ -1,4 +1,4 @@
-/* $Id: indy_int.c,v 1.13 1999/06/12 17:26:15 ulfc Exp $
+/* $Id: indy_int.c,v 1.17 2000/02/04 07:40:23 ralf Exp $
  *
  * indy_int.c: Routines for generic manipulation of the INT[23] ASIC
  *             found on INDY workstations..
@@ -9,7 +9,9 @@
  *                    - Indigo2 changes
  *                    - Interrupt handling fixes
  */
+#include <linux/config.h>
 #include <linux/init.h>
+
 #include <linux/errno.h>
 #include <linux/kernel_stat.h>
 #include <linux/signal.h>
@@ -32,9 +34,9 @@
 
 #include <asm/ptrace.h>
 #include <asm/processor.h>
-#include <asm/sgi.h>
-#include <asm/sgihpc.h>
-#include <asm/sgint23.h>
+#include <asm/sgi/sgi.h>
+#include <asm/sgi/sgihpc.h>
+#include <asm/sgi/sgint23.h>
 #include <asm/sgialib.h>
 #include <asm/gdb-stub.h>
 
@@ -257,8 +259,6 @@
 	return len;
 }
 
-atomic_t __mips_bh_counter;
-
 /*
  * do_IRQ handles IRQ's that have been installed without the
  * SA_INTERRUPT flag: it uses the full signal-handling return
@@ -272,7 +272,7 @@
 	int do_random, cpu;
 
 	cpu = smp_processor_id();
-	hardirq_enter(cpu);
+	irq_enter(cpu);
 	kstat.irqs[0][irq]++;
 
 	printk("Got irq %d, press a key.", irq);
@@ -308,7 +308,7 @@
 			add_interrupt_randomness(irq);
 		__cli();
 	}
-	hardirq_exit(cpu);
+	irq_exit(cpu);
 
 	/* unmasking and bottom half handling is done magically for us. */
 }
@@ -451,10 +451,10 @@
 	/* if action == NULL, then we do have a handler for the irq */
 	if ( action == NULL ) { goto no_handler; }
 	
-	hardirq_enter(cpu);
+	irq_enter(cpu);
 	kstat.irqs[0][irq + 16]++;
 	action->handler(irq, action->dev_id, regs);
-	hardirq_exit(cpu);
+	irq_exit(cpu);
 	goto end;
 
 no_handler:
@@ -489,10 +489,10 @@
 	/* if action == NULL, then we do have a handler for the irq */
 	if ( action == NULL ) { goto no_handler; }
 	
-	hardirq_enter(cpu);
+	irq_enter(cpu);
 	kstat.irqs[0][irq + 24]++;
 	action->handler(irq, action->dev_id, regs);
-	hardirq_exit(cpu);
+	irq_exit(cpu);
 	goto end;
 	
 no_handler:
@@ -507,13 +507,13 @@
 	int cpu = smp_processor_id();
 	int irq = 6;
 
-	hardirq_enter(cpu);
+	irq_enter(cpu);
 	kstat.irqs[0][irq]++;
 	printk("Got a bus error IRQ, shouldn't happen yet\n");
 	show_regs(regs);
 	printk("Spinning...\n");
 	while(1);
-	hardirq_exit(cpu);
+	irq_exit(cpu);
 }
 
 /* Misc. crap just to keep the kernel linking... */