patch-pre2.0.8 linux/arch/ppc/kernel/signal.c

• Lines: 31
• Date: Mon May 27 12:00:58 1996
• Orig file: pre2.0.7/linux/arch/ppc/kernel/signal.c
• Orig date: Mon Mar 11 09:39:33 1996

diff -u --recursive --new-file pre2.0.7/linux/arch/ppc/kernel/signal.c linux/arch/ppc/kernel/signal.c
@@ -56,7 +56,13 @@
 	sc++;  /* Pop signal 'context' */
 	if (sc == (struct sigcontext_struct *)(int_regs))
 	{ /* Last stacked signal */
+#if 0	
+		/* This doesn't work - it blows away the return address! */
 		memcpy(regs, int_regs, sizeof(*regs));
+#else
+		/* Don't mess up 'my' stack frame */
+		memcpy(&regs->gpr, &int_regs->gpr, sizeof(*regs)-sizeof(regs->_overhead));
+#endif		
 		if ((int)regs->orig_gpr3 >= 0 &&
 		    ((int)regs->result == -ERESTARTNOHAND ||
 		     (int)regs->result == -ERESTARTSYS ||
@@ -111,7 +117,7 @@
 			if (signr & (1<<bitno)) break;
 		}
 		signr = bitno;
-#endif		
+#endif
 		current->signal &= ~(1<<signr);  /* Clear bit */
 		sa = current->sig->action + signr;
 		signr++;
@@ -166,7 +172,6 @@
 				/* fall through */
 			default:
 				current->signal |= _S(signr & 0x7f);
-				current->flags |= PF_SIGNALED;
 				do_exit(signr);
 			}
 		}