[Linux-mips-commits]CVS: linux/arch/mips/vr4181/common irq.c,1.1,1.2 Makefile,1.1,1.2

[Jun S. <ju...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr4181/common
In directory usw-pr-cvs1:/tmp/cvs-serv5895/arch/mips/vr4181/common

Modified Files:
	irq.c Makefile 
Log Message:
Osprey kernel more or less works now, but very unstable.  See TODO file.


Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr4181/common/irq.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- irq.c	2001/09/22 04:27:15	1.1
+++ irq.c	2001/09/22 16:35:15	1.2
@@ -49,7 +49,7 @@
 		// it's a cpu interrupt
 		unsigned short newstatus = read_32bit_cp0_register(CP0_STATUS);
 		newstatus &= ~((unsigned short)1 << (irq + 8)); 
-		set_cp0_status(ST0_IM, newstatus);
+		change_cp0_status(ST0_IM, newstatus);
 	} else {
 		if (irq < 40) {
 			// it's an ICU interrupt
@@ -79,7 +79,7 @@
 		// it's a cpu interrupt
 		unsigned short newstatus = read_32bit_cp0_register(CP0_STATUS);
 		newstatus |= ((unsigned short)1 << (irq + 8)); 
-		set_cp0_status(ST0_IM, newstatus);
+		change_cp0_status(ST0_IM, newstatus);
 	} else {
 		if (irq < 40) {
 			// it's an ICU interrupt
@@ -120,11 +120,6 @@
 
 static irq_info_t irq_info[VR4181_IRQ_MAX + 1];
 
-void inline disable_irq_nosync(unsigned int irq)
-{
-	disable_irq(irq);
-}
-
 void disable_irq(unsigned int irq_nr)
 {
 	unsigned long flags;
@@ -387,7 +382,7 @@
 	// and finishes bit-processing irq_mask_probe at the same time
 	save_and_cli(flags);
 	tmp = read_32bit_cp0_register(CP0_STATUS);
-	set_cp0_status(ST0_IM, tmp & irq_mask_probe[0]);
+	change_cp0_status(ST0_IM, tmp & irq_mask_probe[0]);
 	irq_mask_probe[0] |= tmp;
 	tmp = *VR4181_MSYSINT1REG;
 	*VR4181_MSYSINT1REG = tmp & irq_mask_probe[1];

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr4181/common/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	2001/09/22 04:27:15	1.1
+++ Makefile	2001/09/22 16:35:15	1.2
@@ -13,6 +13,6 @@
 
 O_TARGET:= vr4181.o
 
-obj-y	 := irq.o kbd_no.o serial.o time.o
+obj-y	 := irq.o serial.o time.o
 
 include $(TOPDIR)/Rules.make