[Linux-mips-commits]CVS: linux/arch/mips/sni int-handler.S,1.1.1.1,1.2 irq.c,1.1.1.1,1.2 setup.c,1.1.1.1,1.2

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/sni
In directory usw-pr-cvs1:/tmp/cvs-serv6109/sni

Modified Files:
	int-handler.S irq.c setup.c 
Log Message:
Make RM200C compile again.

Index: int-handler.S
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/sni/int-handler.S,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- int-handler.S	2001/06/22 02:29:31	1.1.1.1
+++ int-handler.S	2001/10/02 17:18:31	1.2
@@ -1,7 +1,7 @@
 /*
  * SNI RM200 PCI specific interrupt handler code.
  *
- * Copyright (C) 1994, 95, 96, 97, 98, 1999, 2000 by Ralf Baechle
+ * Copyright (C) 1994, 95, 96, 97, 98, 1999, 2000, 01 by Ralf Baechle
  */
 #include <asm/asm.h>
 #include <asm/mipsregs.h>
@@ -9,12 +9,13 @@
 #include <asm/sni.h>
 #include <asm/stackframe.h>
 
-/* The PCI ASIC has the nasty property that it may delay writes if it is busy.
-   As a consequence from writes that have not graduated when we exit from the
-   interrupt handler we might catch a spurious interrupt.  To avoid this we
-   force the PCI ASIC to graduate all writes by executing a read from the
-   PCI bus.  */
-
+/*
+ * The PCI ASIC has the nasty property that it may delay writes if it is busy.
+ * As a consequence from writes that have not graduated when we exit from the
+ * interrupt handler we might catch a spurious interrupt.  To avoid this we
+ * force the PCI ASIC to graduate all writes by executing a read from the
+ * PCI bus.
+ */
 		.set	noreorder
 		.set	noat
 		.align	5
@@ -46,7 +47,7 @@
 		bnez	t1, _hwint0
 		 nop
 
-		j	return				# spurious interrupt
+		j	restore_all			# spurious interrupt
 		 nop
 
  ##############################################################################

Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/sni/irq.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- irq.c	2001/06/22 02:29:31	1.1.1.1
+++ irq.c	2001/10/02 17:18:31	1.2
@@ -126,7 +126,7 @@
 
 void __init init_pciasic(void)
 {
-	unsigned int flags;
+	unsigned long flags;
 
 	spin_lock_irqsave(&pciasic_lock, flags);
 	* (volatile u8 *) PCIMT_IRQSEL =

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/sni/setup.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- setup.c	2001/06/22 02:29:31	1.1.1.1
+++ setup.c	2001/10/02 17:18:31	1.2
@@ -30,6 +30,7 @@
 #include <asm/processor.h>
 #include <asm/reboot.h>
 #include <asm/sni.h>
+#include <asm/time.h>
 
 extern void sni_machine_restart(char *command);
 extern void sni_machine_halt(void);
@@ -39,8 +40,6 @@
 extern struct rtc_ops std_rtc_ops;
 extern struct kbd_ops std_kbd_ops;
 
-void (*board_time_init)(struct irqaction *irq);
-
 static void __init sni_rm200_pci_time_init(struct irqaction *irq)
 {
 	/* set the clock to 100 Hz */
@@ -50,7 +49,6 @@
 	setup_irq(0, irq);
 }
 
-unsigned char aux_device_present;
 extern unsigned char sni_map_isa_cache;
 
 /*