[Linux-mips-commits] CVS: linux/arch/mips64/sgi-ip27 ip27-irq.c,1.1.1.1,1.2 ip27-pci.c,1.1.1.1,1.2

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

Update of /cvsroot/linux-mips/linux/arch/mips64/sgi-ip27
In directory usw-pr-cvs1:/tmp/cvs-serv15361/arch/mips64/sgi-ip27

Modified Files:
	ip27-irq.c ip27-pci.c 
Log Message:
Synced to Ralph's tree

Index: ip27-irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/sgi-ip27/ip27-irq.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ip27-irq.c	2001/06/22 02:29:32	1.1.1.1
--- ip27-irq.c	2001/08/22 18:18:14	1.2
***************
*** 93,102 ****
  		if (node_level_to_irq[nodenum][j] == -1) {
  			node_level_to_irq[nodenum][j] = irq;
! 			return(j);
  		}
  	}
  	printk("Cpu %ld flooded with devices\n", cpunum);
  	while(1);
! 	return(-1);
  }
  
--- 93,102 ----
  		if (node_level_to_irq[nodenum][j] == -1) {
  			node_level_to_irq[nodenum][j] = irq;
! 			return j;
  		}
  	}
  	printk("Cpu %ld flooded with devices\n", cpunum);
  	while(1);
! 	return -1;
  }
  
***************
*** 184,188 ****
  	irq_exit(thiscpu, irq);
  
! 	/* unmasking and bottom half handling is done magically for us. */
  }
  
--- 184,189 ----
  	irq_exit(thiscpu, irq);
  
! 	if (softirq_pending(thiscpu))
! 		do_softirq();
  }
  

Index: ip27-pci.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/sgi-ip27/ip27-pci.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ip27-pci.c	2001/06/22 02:29:32	1.1.1.1
--- ip27-pci.c	2001/08/22 18:18:14	1.2
***************
*** 257,260 ****
--- 257,265 ----
  }
  
+ unsigned __init int pcibios_assign_all_busses(void)
+ {
+ 	return 0;
+ }
+ 
  char * __init
  pcibios_setup(char *str)