patch-2.2.11 linux/arch/mips/kernel/signal.c

• Lines: 38
• Date: Mon Aug 9 12:04:38 1999
• Orig file: v2.2.10/linux/arch/mips/kernel/signal.c
• Orig date: Tue Oct 20 13:52:54 1998

diff -u --recursive --new-file v2.2.10/linux/arch/mips/kernel/signal.c linux/arch/mips/kernel/signal.c
@@ -1,4 +1,4 @@
-/* $Id: signal.c,v 1.24 1998/09/16 22:50:42 ralf Exp $
+/* $Id: signal.c,v 1.18.2.1 1999/06/17 12:06:40 ralf Exp $
  *
  *  linux/arch/mips/kernel/signal.c
  *
@@ -392,6 +392,7 @@
 		}
 	/* fallthrough */
 	case ERESTARTNOINTR:		/* Userland will reload $v0.  */
+		regs->regs[7] = regs->regs[26];
 		regs->cp0_epc -= 8;
 	}
 
@@ -491,6 +492,7 @@
 
 			case SIGQUIT: case SIGILL: case SIGTRAP:
 			case SIGABRT: case SIGFPE: case SIGSEGV:
+			case SIGBUS:
 				lock_kernel();
 				if (current->binfmt
 				    && current->binfmt->core_dump
@@ -502,6 +504,7 @@
 			default:
 				lock_kernel();
 				sigaddset(&current->signal, signr);
+				recalc_sigpending(current);
 				current->flags |= PF_SIGNALED;
 				do_exit(exit_code);
 				/* NOTREACHED */
@@ -524,6 +527,7 @@
 		if (regs->regs[2] == ERESTARTNOHAND ||
 		    regs->regs[2] == ERESTARTSYS ||
 		    regs->regs[2] == ERESTARTNOINTR) {
+			regs->regs[7] = regs->regs[26];
 			regs->cp0_epc -= 8;
 		}
 	}