[Linux-mips-commits]CVS: linux/arch/mips64/kernel traps.c,1.2,1.3

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

Update of /cvsroot/linux-mips/linux/arch/mips64/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv16545

Modified Files:
	traps.c 
Log Message:
Skip over copX instructions for X != 1 also.

Index: traps.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/kernel/traps.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** traps.c	2001/07/12 18:46:11	1.2
--- traps.c	2001/09/10 16:31:34	1.3
***************
*** 348,356 ****
  void do_ri(struct pt_regs *regs)
  {
- 	printk("Cpu%d[%s:%d] Illegal instruction at %08lx ra=%08lx\n",
- 	        smp_processor_id(), current->comm, current->pid, regs->cp0_epc, 
- 		regs->regs[31]);
  	if (compute_return_epc(regs))
  		return;
  	force_sig(SIGILL, current);
  }
--- 348,354 ----
  void do_ri(struct pt_regs *regs)
  {
  	if (compute_return_epc(regs))
  		return;
+ 
  	force_sig(SIGILL, current);
  }
***************
*** 389,392 ****
--- 387,391 ----
  
  bad_cid:
+ 	compute_return_epc(regs);
  	force_sig(SIGILL, current);
  }