[Linux-mips-commits]CVS: linux/arch/mips/hp-lj int-handler.S,1.1,1.2 pci.c,1.1,1.2

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

Update of /cvsroot/linux-mips/linux/arch/mips/hp-lj
In directory usw-pr-cvs1:/tmp/cvs-serv12292

Modified Files:
	int-handler.S pci.c 
Log Message:
Fill missing nop into delay slot.

Index: int-handler.S
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/hp-lj/int-handler.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- int-handler.S	2001/11/19 18:31:01	1.1
+++ int-handler.S	2001/11/26 18:38:40	1.2
@@ -54,6 +54,7 @@
 	jal	do_IRQ
 	nop				# delay slot
 	j       ret_from_irq
+	nop
 
 /*
 	mfc0	t0,CP0_STATUS		# disable interrupts

Index: pci.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/hp-lj/pci.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pci.c	2001/11/19 18:31:01	1.1
+++ pci.c	2001/11/26 18:38:40	1.2
@@ -178,9 +178,7 @@
    // by letting both low (illegal) and high (legal) addresses appear in pci io space
    ioport_resource.start = 0x0; 
 
-   mips_io_port_base = IO_PORT_LOGICAL_START + IO_PORT_VIRTUAL_OFFSET;
-   printk("Set IO port base to 0x%lx\n", mips_io_port_base);
-
+   set_io_port_base(IO_PORT_LOGICAL_START + IO_PORT_VIRTUAL_OFFSET);
 
    // map the PCI address space
    // global map - all levels & processes can access