[SIGNAL]: Allow more platforms to use generic get_signal_to_deliver.

The few platforms that cannot use the generic
get_signal_to_deliver implementation cannot do
so because they do special things for ptraced
children.  This can be easily avoided and thus
all of the signal handling code duplication can
be eliminated.

This is the first part, which adds a platform hook
right before the parent of the ptraced child is woken.
Data can be passed in via a cookie argument.

The next part will be dealing with platforms
that need to muck with breakpoints in the child
in this same code block.

arch/alpha/kernel/signal.c

@@ -619,7 +619,7 @@ do_signal(sigset_t *oldset, struct pt_regs * regs, struct switch_stack * sw,
 	if (!oldset)
 		oldset = &current->blocked;
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 
 	if (signr > 0) {
 		/* Whee!  Actually deliver the signal.  */

arch/cris/kernel/signal.c

@@ -560,7 +560,7 @@ int do_signal(int canrestart, sigset_t *oldset, struct pt_regs *regs)
 	if (!oldset)
 		oldset = &current->blocked;
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 	if (signr > 0) {
 		/* Whee!  Actually deliver the signal.  */
 		handle_signal(canrestart, signr, &info, oldset, regs);

arch/i386/kernel/signal.c

@@ -582,7 +582,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
 	if (!oldset)
 		oldset = &current->blocked;
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 	if (signr > 0) {
 		/* Reenable any watchpoints before delivering the
 		 * signal to user space. The processor register will

arch/ia64/kernel/signal.c

@@ -517,7 +517,7 @@ ia64_do_signal (sigset_t *oldset, struct sigscratch *scr, long in_syscall)
 		restart = 0;
 
 	while (1) {
-		int signr = get_signal_to_deliver(&info, &scr->pt);
+		int signr = get_signal_to_deliver(&info, &scr->pt, NULL);
 
 		if (signr <= 0)
 			break;

arch/m68knommu/kernel/signal.c

@@ -768,7 +768,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
 	for (;;) {
 		int signr;
 
-		signr = get_signal_to_deliver(&info, regs);
+		signr = get_signal_to_deliver(&info, regs, NULL);
 
 		if (!signr)
 			break;

arch/mips/kernel/signal.c

@@ -544,7 +544,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
 	if (!oldset)
 		oldset = &current->blocked;
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 	if (signr > 0) {
 		if (regs->regs[0])
 			syscall_restart(regs, ka);

arch/mips64/kernel/signal.c

@@ -602,7 +602,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
 	if (!oldset)
 		oldset = &current->blocked;
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 	if (signr > 0) {
 		if (regs->regs[0])
 			syscall_restart(regs, ka);

arch/mips64/kernel/signal32.c

@@ -676,7 +676,7 @@ asmlinkage int do_signal32(sigset_t *oldset, struct pt_regs *regs)
 	if (!oldset)
 		oldset = &current->blocked;
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 	if (signr > 0) {
 		if (regs->regs[0])
 			syscall_restart(regs, ka);

arch/ppc/kernel/signal.c

@@ -484,7 +484,7 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
 
 	newsp = frame = 0;
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 	if (signr > 0) {
 		ka = &current->sig->action[signr-1];
 		if ( (ka->sa.sa_flags & SA_ONSTACK)

arch/ppc64/kernel/signal.c

@@ -551,7 +551,7 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
 
 	newsp = frame = 0;
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 	if (signr > 0) {
 		ka = &current->sighand->action[signr-1];
 		if ((ka->sa.sa_flags & SA_ONSTACK)

arch/ppc64/kernel/signal32.c

@@ -1063,7 +1063,7 @@ int do_signal32(sigset_t *oldset, struct pt_regs *regs)
 
 	newsp = frame = 0;
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 	if (signr > 0) {
 		ka = &current->sighand->action[signr-1];
 		if ((ka->sa.sa_flags & SA_ONSTACK)

arch/s390/kernel/signal.c

@@ -461,7 +461,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
 	if (!oldset)
 		oldset = &current->blocked;
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 	if (signr > 0) {
 		/* Whee!  Actually deliver the signal.  */
 		handle_signal(signr, &info, oldset, regs);

arch/s390x/kernel/signal.c

@@ -461,7 +461,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
         }
 #endif 
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 	if (signr > 0) {
 		/* Whee!  Actually deliver the signal.  */
 		handle_signal(signr, &info, oldset, regs);

arch/s390x/kernel/signal32.c

@@ -622,7 +622,7 @@ int do_signal32(struct pt_regs *regs, sigset_t *oldset)
 	if (!oldset)
 		oldset = &current->blocked;
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 	if (signr > 0) {
 		/* Whee!  Actually deliver the signal.  */
 		handle_signal32(signr, &info, oldset, regs);

arch/sh/kernel/signal.c

@@ -556,7 +556,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
 	if (!oldset)
 		oldset = &current->blocked;
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 	if (signr > 0) {
 		/* Whee!  Actually deliver the signal.  */
 		handle_signal(signr, &info, oldset, regs);

arch/sparc/kernel/signal.c

@@ -1045,8 +1045,9 @@ static inline void syscall_restart(unsigned long orig_i0, struct pt_regs *regs,
 asmlinkage int do_signal(sigset_t *oldset, struct pt_regs * regs,
 			 unsigned long orig_i0, int restart_syscall)
 {
-	struct k_sigaction *ka;
 	siginfo_t info;
+	struct sparc_deliver_cookie cookie;
+	int signr;
 
 	/*
 	 * XXX Disable svr4 signal handling until solaris emulation works.
@@ -1059,142 +1060,32 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs * regs,
 	int svr4_signal = current->personality == PER_SVR4;
 #endif
 
+	cookie.restart_syscall = restart_syscall;
+	cookie.orig_i0 = orig_i0;
+
 	if (!oldset)
 		oldset = &current->blocked;
 
-	for (;;) {
-		sigset_t *mask = &current->blocked;
-		unsigned long signr = 0;
-
-		spin_lock_irq(&current->sighand->siglock);
-		signr = dequeue_signal(mask, &info);
-		spin_unlock_irq(&current->sighand->siglock);
-
-		if (!signr)
-			break;
-
-		if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) {
-			/* Do the syscall restart before we let the debugger
-			 * look at the child registers.
-			 */
-			if (restart_syscall &&
-			    (regs->u_regs[UREG_I0] == ERESTARTNOHAND ||
-			     regs->u_regs[UREG_I0] == ERESTARTSYS ||
-			     regs->u_regs[UREG_I0] == ERESTARTNOINTR)) {
-				/* replay the system call when we are done */
-				regs->u_regs[UREG_I0] = orig_i0;
-				regs->pc -= 4;
-				regs->npc -= 4;
-				restart_syscall = 0;
-			}
-			if (restart_syscall &&
-			    regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
-				regs->u_regs[UREG_G1] = __NR_restart_syscall;
-				regs->pc -= 4;
-				regs->npc -= 4;
-				restart_syscall = 0;
-			}
-			current->exit_code = signr;
-			set_current_state(TASK_STOPPED);
-
-			/* This happens to be SMP safe so no need to
-			 * grab master kernel lock even in this case.
-			 */
-			notify_parent(current, SIGCHLD);
-			schedule();
-			if (!(signr = current->exit_code))
-				continue;
-			current->exit_code = 0;
-			if (signr == SIGSTOP)
-				continue;
-
-			/* Update the siginfo structure.  Is this good?  */
-			if (signr != info.si_signo) {
-				info.si_signo = signr;
-				info.si_errno = 0;
-				info.si_code = SI_USER;
-				info.si_pid = current->parent->pid;
-				info.si_uid = current->parent->uid;
-			}
-
-			/* If the (new) signal is now blocked, requeue it.  */
-			if (sigismember(&current->blocked, signr)) {
-				send_sig_info(signr, &info, current);
-				continue;
-			}
-		}
-
-		ka = &current->sig->action[signr-1];
-
-		if (ka->sa.sa_handler == SIG_IGN) {
-			if (signr != SIGCHLD)
-				continue;
-
-			/* sys_wait4() grabs the master kernel lock, so
-			 * we need not do so, that sucker should be
-			 * threaded and would not be that difficult to
-			 * do anyways.
-			 */
-			while(sys_wait4(-1, NULL, WNOHANG, NULL) > 0)
-				;
-			continue;
-		}
-		if (ka->sa.sa_handler == SIG_DFL) {
-			unsigned long exit_code = signr;
-
-			if (current->pid == 1)
-				continue;
-			switch (signr) {
-			case SIGCONT: case SIGCHLD: case SIGWINCH: case SIGURG:
-				continue;
-
-			case SIGTSTP: case SIGTTIN: case SIGTTOU:
-				/* The operations performed by
-				 * is_orphaned_pgrp() are protected by
-				 * the tasklist_lock.
-				 */
-				if (is_orphaned_pgrp(current->pgrp))
-					continue;
-
-			case SIGSTOP: {
-				struct signal_struct *sig;
-				set_current_state(TASK_STOPPED);
-				current->exit_code = signr;
-				sig = current->parent->sig;
-				if (sig && !(sig->action[SIGCHLD-1].sa.sa_flags &
-				      SA_NOCLDSTOP))
-					notify_parent(current, SIGCHLD);
-				schedule();
-				continue;
-			}
-
-			case SIGQUIT: case SIGILL: case SIGTRAP:
-			case SIGABRT: case SIGFPE: case SIGSEGV:
-			case SIGBUS: case SIGSYS: case SIGXCPU: case SIGXFSZ:
-				if (do_coredump(signr, exit_code, regs))
-					exit_code |= 0x80;
-				/* FALLTHRU */
-
-			default:
-				sig_exit(signr, exit_code, &info);
-				/* NOT REACHED */
-			}
-		}
-		if (restart_syscall)
-			syscall_restart(orig_i0, regs, &ka->sa);
+	signr = get_signal_to_deliver(&info, regs, &cookie);
+	if (signr > 0) {
+		struct k_sigaction *ka;
+		
+		ka = &current->sighand->action[signr-1];
+		if (cookie.restart_syscall)
+			syscall_restart(cookie.orig_i0, regs, &ka->sa);
 		handle_signal(signr, ka, &info, oldset, regs, svr4_signal);
 		return 1;
 	}
-	if (restart_syscall &&
+	if (cookie.restart_syscall &&
 	    (regs->u_regs[UREG_I0] == ERESTARTNOHAND ||
 	     regs->u_regs[UREG_I0] == ERESTARTSYS ||
 	     regs->u_regs[UREG_I0] == ERESTARTNOINTR)) {
 		/* replay the system call when we are done */
-		regs->u_regs[UREG_I0] = orig_i0;
+		regs->u_regs[UREG_I0] = cookie.orig_i0;
 		regs->pc -= 4;
 		regs->npc -= 4;
 	}
-	if (restart_syscall &&
+	if (cookie.restart_syscall &&
 	    regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
 		regs->u_regs[UREG_G1] = __NR_restart_syscall;
 		regs->pc -= 4;

arch/sparc64/kernel/signal.c

@@ -603,8 +603,12 @@ static int do_signal(sigset_t *oldset, struct pt_regs * regs,
 		     unsigned long orig_i0, int restart_syscall)
 {
 	siginfo_t info;
-	struct k_sigaction *ka;
+	struct signal_deliver_cookie cookie;
+	int signr;
 	
+	cookie.restart_syscall = restart_syscall;
+	cookie.orig_i0 = orig_i0;
+
 	if (!oldset)
 		oldset = &current->blocked;
 
@@ -612,135 +616,31 @@ static int do_signal(sigset_t *oldset, struct pt_regs * regs,
 	if (test_thread_flag(TIF_32BIT)) {
 		extern int do_signal32(sigset_t *, struct pt_regs *,
 				       unsigned long, int);
-		return do_signal32(oldset, regs, orig_i0, restart_syscall);
+		return do_signal32(oldset, regs, orig_i0,
+				   cookie.restart_syscall);
 	}
 #endif	
-	for (;;) {
-		sigset_t *mask = &current->blocked;
-		unsigned long signr = 0;
 
-		spin_lock_irq(&current->sighand->siglock);
-		signr = dequeue_signal(mask, &info);
-		spin_unlock_irq(&current->sighand->siglock);
-		
-		if (!signr)
-			break;
-
-		if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) {
-			/* Do the syscall restart before we let the debugger
-			 * look at the child registers.
-			 */
-			if (restart_syscall &&
-			    (regs->u_regs[UREG_I0] == ERESTARTNOHAND ||
-			     regs->u_regs[UREG_I0] == ERESTARTSYS ||
-			     regs->u_regs[UREG_I0] == ERESTARTNOINTR)) {
-				/* replay the system call when we are done */
-				regs->u_regs[UREG_I0] = orig_i0;
-				regs->tpc -= 4;
-				regs->tnpc -= 4;
-				restart_syscall = 0;
-			}
-			if (restart_syscall &&
-			    regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
-				regs->u_regs[UREG_G1] = __NR_restart_syscall;
-				regs->tpc -= 4;
-				regs->tnpc -= 4;
-				restart_syscall = 0;
-			}
-
-			current->exit_code = signr;
-			set_current_state(TASK_STOPPED);
-			notify_parent(current, SIGCHLD);
-			schedule();
-			if (!(signr = current->exit_code))
-				continue;
-			current->exit_code = 0;
-			if (signr == SIGSTOP)
-				continue;
-
-			/* Update the siginfo structure.  Is this good?  */
-			if (signr != info.si_signo) {
-				info.si_signo = signr;
-				info.si_errno = 0;
-				info.si_code = SI_USER;
-				info.si_pid = current->parent->pid;
-				info.si_uid = current->parent->uid;
-			}
-
-			/* If the (new) signal is now blocked, requeue it.  */
-			if (sigismember(&current->blocked, signr)) {
-				send_sig_info(signr, &info, current);
-				continue;
-			}
-		}
-		
-		ka = &current->sig->action[signr-1];
-		
-		if (ka->sa.sa_handler == SIG_IGN) {
-			if (signr != SIGCHLD)
-				continue;
-
-                        /* sys_wait4() grabs the master kernel lock, so
-                         * we need not do so, that sucker should be
-                         * threaded and would not be that difficult to
-                         * do anyways.
-                         */
-                        while (sys_wait4(-1, NULL, WNOHANG, NULL) > 0)
-                                ;
-			continue;
-		}
-		if (ka->sa.sa_handler == SIG_DFL) {
-			unsigned long exit_code = signr;
-			
-			if (current->pid == 1)
-				continue;
-			switch (signr) {
-			case SIGCONT: case SIGCHLD: case SIGWINCH: case SIGURG:
-				continue;
-
-			case SIGTSTP: case SIGTTIN: case SIGTTOU:
-				if (is_orphaned_pgrp(current->pgrp))
-					continue;
-
-			case SIGSTOP: {
-				struct signal_struct *sig;
-				set_current_state(TASK_STOPPED);
-				current->exit_code = signr;
-				sig = current->parent->sig;
-				if (sig && !(sig->action[SIGCHLD-1].sa.sa_flags &
-				      SA_NOCLDSTOP))
-					notify_parent(current, SIGCHLD);
-				schedule();
-				continue;
-			}
-
-			case SIGQUIT: case SIGILL: case SIGTRAP:
-			case SIGABRT: case SIGFPE: case SIGSEGV:
-			case SIGBUS: case SIGSYS: case SIGXCPU: case SIGXFSZ:
-				if (do_coredump(signr, exit_code, regs))
-					exit_code |= 0x80;
-				/* FALLTHRU */
-
-			default:
-				sig_exit(signr, exit_code, &info);
-				/* NOT REACHED */
-			}
-		}
-		if (restart_syscall)
+	signr = get_signal_to_deliver(&info, regs, &cookie);
+	if (signr > 0) {
+		struct k_sigaction *ka;
+
+		ka = &current->sighand->action[signr-1];
+		if (cookie.restart_syscall)
 			syscall_restart(orig_i0, regs, &ka->sa);
 		handle_signal(signr, ka, &info, oldset, regs);
 		return 1;
 	}
-	if (restart_syscall &&
+	if (cookie.restart_syscall &&
 	    (regs->u_regs[UREG_I0] == ERESTARTNOHAND ||
 	     regs->u_regs[UREG_I0] == ERESTARTSYS ||
 	     regs->u_regs[UREG_I0] == ERESTARTNOINTR)) {
 		/* replay the system call when we are done */
-		regs->u_regs[UREG_I0] = orig_i0;
+		regs->u_regs[UREG_I0] = cookie.orig_i0;
 		regs->tpc -= 4;
 		regs->tnpc -= 4;
 	}
-	if (restart_syscall &&
+	if (cookie.restart_syscall &&
 	    regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
 		regs->u_regs[UREG_G1] = __NR_restart_syscall;
 		regs->tpc -= 4;

arch/sparc64/kernel/signal32.c

@@ -1279,136 +1279,34 @@ static inline void syscall_restart32(unsigned long orig_i0, struct pt_regs *regs
 int do_signal32(sigset_t *oldset, struct pt_regs * regs,
 		unsigned long orig_i0, int restart_syscall)
 {
-	struct k_sigaction *ka;
 	siginfo_t info;
-	
+	struct signal_deliver_cookie cookie;
+	int signr;
 	int svr4_signal = current->personality == PER_SVR4;
 	
-	for (;;) {
-		sigset_t *mask = &current->blocked;
-		unsigned long signr = 0;
-
-		spin_lock_irq(&current->sighand->siglock);
-		signr = dequeue_signal(mask, &info);
-		spin_unlock_irq(&current->sighand->siglock);
-		
-		if (!signr)
-			break;
+	cookie.restart_syscall = restart_syscall;
+	cookie.orig_i0 = orig_i0;
 
-		if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) {
-			/* Do the syscall restart before we let the debugger
-			 * look at the child registers.
-			 */
-			if (restart_syscall &&
-			    (regs->u_regs[UREG_I0] == ERESTARTNOHAND ||
-			     regs->u_regs[UREG_I0] == ERESTARTSYS ||
-			     regs->u_regs[UREG_I0] == ERESTARTNOINTR)) {
-				/* replay the system call when we are done */
-				regs->u_regs[UREG_I0] = orig_i0;
-				regs->tpc -= 4;
-				regs->tnpc -= 4;
-				restart_syscall = 0;
-			}
-			if (restart_syscall &&
-			    regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
-				regs->u_regs[UREG_G1] = __NR_restart_syscall;
-				regs->tpc -= 4;
-				regs->tnpc -= 4;
-				restart_syscall = 0;
-			}
-
-			current->exit_code = signr;
-			set_current_state(TASK_STOPPED);
-			notify_parent(current, SIGCHLD);
-			schedule();
-			if (!(signr = current->exit_code))
-				continue;
-			current->exit_code = 0;
-			if (signr == SIGSTOP)
-				continue;
-
-			/* Update the siginfo structure.  Is this good?  */
-			if (signr != info.si_signo) {
-				info.si_signo = signr;
-				info.si_errno = 0;
-				info.si_code = SI_USER;
-				info.si_pid = current->parent->pid;
-				info.si_uid = current->parent->uid;
-			}
+	signr = get_signal_to_deliver(&info, regs, &cookie);
+	if (signr > 0) {
+		struct k_sigaction *ka;
 
-			/* If the (new) signal is now blocked, requeue it.  */
-			if (sigismember(&current->blocked, signr)) {
-				send_sig_info(signr, &info, current);
-				continue;
-			}
-		}
-		
-		ka = &current->sig->action[signr-1];
-		
-		if (ka->sa.sa_handler == SIG_IGN) {
-			if (signr != SIGCHLD)
-				continue;
-
-			/* sys_wait4() grabs the master kernel lock, so
-			 * we need not do so, that sucker should be
-			 * threaded and would not be that difficult to
-			 * do anyways.
-			 */
-			while (sys_wait4(-1, NULL, WNOHANG, NULL) > 0)
-				;
-			continue;
-		}
-		if (ka->sa.sa_handler == SIG_DFL) {
-			unsigned long exit_code = signr;
-			
-			if (current->pid == 1)
-				continue;
-			switch (signr) {
-			case SIGCONT: case SIGCHLD: case SIGWINCH: case SIGURG:
-				continue;
-
-			case SIGTSTP: case SIGTTIN: case SIGTTOU:
-				if (is_orphaned_pgrp(current->pgrp))
-					continue;
-
-			case SIGSTOP: {
-				struct signal_struct *sig;
-				set_current_state(TASK_STOPPED);
-				current->exit_code = signr;
-				sig = current->parent->sig;
-				if (sig && !(sig->action[SIGCHLD-1].sa.sa_flags &
-				      SA_NOCLDSTOP))
-					notify_parent(current, SIGCHLD);
-				schedule();
-				continue;
-			}
-			case SIGQUIT: case SIGILL: case SIGTRAP:
-			case SIGABRT: case SIGFPE: case SIGSEGV:
-			case SIGBUS: case SIGSYS: case SIGXCPU: case SIGXFSZ:
-				if (do_coredump(signr, exit_code, regs))
-					exit_code |= 0x80;
-				/* FALLTHRU */
-
-			default:
-				sig_exit(signr, exit_code, &info);
-				/* NOT REACHED */
-			}
-		}
-		if (restart_syscall)
+		ka = &current->sighand->action[signr-1];
+		if (cookie.restart_syscall)
 			syscall_restart32(orig_i0, regs, &ka->sa);
 		handle_signal32(signr, ka, &info, oldset, regs, svr4_signal);
 		return 1;
 	}
-	if (restart_syscall &&
+	if (cookie.restart_syscall &&
 	    (regs->u_regs[UREG_I0] == ERESTARTNOHAND ||
 	     regs->u_regs[UREG_I0] == ERESTARTSYS ||
 	     regs->u_regs[UREG_I0] == ERESTARTNOINTR)) {
 		/* replay the system call when we are done */
-		regs->u_regs[UREG_I0] = orig_i0;
+		regs->u_regs[UREG_I0] = cookie.orig_i0;
 		regs->tpc -= 4;
 		regs->tnpc -= 4;
 	}
-	if (restart_syscall &&
+	if (cookie.restart_syscall &&
 	    regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
 		regs->u_regs[UREG_G1] = __NR_restart_syscall;
 		regs->tpc -= 4;

arch/um/kernel/signal_kern.c

@@ -136,7 +136,7 @@ static int kern_do_signal(struct pt_regs *regs, sigset_t *oldset, int error)
 	if (!oldset)
 		oldset = &current->blocked;
 
-	sig = get_signal_to_deliver(&info, regs);
+	sig = get_signal_to_deliver(&info, regs, NULL);
 	if(sig == 0)
 		return(0);
 

arch/v850/kernel/signal.c

@@ -506,7 +506,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
 	if (!oldset)
 		oldset = &current->blocked;
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 	if (signr > 0) {
 		/* Whee!  Actually deliver the signal.  */
 		handle_signal(signr, &info, oldset, regs);

arch/x86_64/kernel/signal.c

@@ -437,7 +437,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
 	if (!oldset)
 		oldset = &current->blocked;
 
-	signr = get_signal_to_deliver(&info, regs);
+	signr = get_signal_to_deliver(&info, regs, NULL);
 	if (signr > 0) {
 		/* Reenable any watchpoints before delivering the
 		 * signal to user space. The processor register will

include/asm-alpha/signal.h

@@ -186,6 +186,7 @@ struct sigstack {
 #ifdef __KERNEL__
 #include <asm/sigcontext.h>
 
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
 #define HAVE_ARCH_SYS_PAUSE
 
 #endif

include/asm-cris/signal.h

@@ -181,6 +181,7 @@ typedef struct sigaltstack {
 /* here we could define asm-optimized sigaddset, sigdelset etc. operations. 
  * if we don't, generic ones are used from linux/signal.h
  */
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
 
 #endif /* __KERNEL__ */
 

include/asm-i386/signal.h

@@ -217,6 +217,7 @@ static __inline__ int sigfindinword(unsigned long word)
 
 struct pt_regs;
 extern int FASTCALL(do_signal(struct pt_regs *regs, sigset_t *oldset));
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
 
 #endif /* __KERNEL__ */
 

include/asm-ia64/signal.h

@@ -166,6 +166,7 @@ struct k_sigaction {
 
 #  include <asm/sigcontext.h>
 
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
 #define HAVE_ARCH_SYS_PAUSE
 
 #endif /* __KERNEL__ */

include/asm-m68knommu/signal.h

@@ -176,6 +176,8 @@ typedef struct sigaltstack {
 #include <asm/sigcontext.h>
 #undef __HAVE_ARCH_SIG_BITOPS
 
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
+
 #endif /* __KERNEL__ */
 
 #endif /* _M68KNOMMU_SIGNAL_H */

include/asm-mips/signal.h

@@ -169,6 +169,8 @@ typedef struct sigaltstack {
 #define _BRK_THREADBP	11	/* For threads, user bp (used by debuggers) */
 #define BRK_MULOVF	1023	/* Multiply overflow */
 
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
+
 #endif /* defined (__KERNEL__) */
 
 #endif /* _ASM_SIGNAL_H */

include/asm-mips64/signal.h

@@ -168,6 +168,9 @@ typedef struct sigaltstack {
 #define BRK_NORLD	10	/* No rld found - not used by Linux/MIPS */
 #define _BRK_THREADBP	11	/* For threads, user bp (used by debuggers) */
 #define BRK_MULOVF	1023	/* Multiply overflow */
+
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
+
 #endif /* defined (__KERNEL__) || defined (__USE_MISC) */
 
 #endif /* !defined (_ASM_SIGNAL_H) */

include/asm-ppc/signal.h

@@ -150,6 +150,7 @@ typedef struct sigaltstack {
 
 #ifdef __KERNEL__
 #include <asm/sigcontext.h>
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
 #endif /* __KERNEL__ */
 
 #endif

include/asm-ppc64/signal.h

@@ -143,4 +143,6 @@ typedef struct sigaltstack {
 	size_t ss_size;
 } stack_t;
 
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
+
 #endif /* _ASMPPC64_SIGNAL_H */

include/asm-s390/signal.h

@@ -175,6 +175,8 @@ struct sigaction {
 #define sa_handler      _u._sa_handler
 #define sa_sigaction    _u._sa_sigaction
 
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
+
 #endif /* __KERNEL__ */
 
 typedef struct sigaltstack {

include/asm-s390x/signal.h

@@ -175,6 +175,8 @@ struct sigaction {
 #define sa_handler      _u._sa_handler
 #define sa_sigaction    _u._sa_sigaction
 
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
+
 #endif /* __KERNEL__ */
 
 typedef struct sigaltstack {

include/asm-sh/signal.h

@@ -165,6 +165,8 @@ typedef struct sigaltstack {
 #ifdef __KERNEL__
 #include <asm/sigcontext.h>
 
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
+
 #endif /* __KERNEL__ */
 
 #endif /* __ASM_SH_SIGNAL_H */

include/asm-sparc/signal.h

@@ -216,7 +216,32 @@ typedef struct sigaltstack {
 	size_t		ss_size;
 } stack_t;
 
-#define HAVE_ARCH_GET_SIGNAL_TO_DELIVER
+struct sparc_deliver_cookie {
+	int restart_syscall;
+	unsigned long orig_i0;
+};
+
+#define ptrace_signal_deliver(REGS, COOKIE) \
+do {	struct sparc_deliver_cookie *cp = (COOKIE); \
+	if (cp->restart_syscall && \
+	    (regs->u_regs[UREG_I0] == ERESTARTNOHAND || \
+	     regs->u_regs[UREG_I0] == ERESTARTSYS || \
+	     regs->u_regs[UREG_I0] == ERESTARTNOINTR)) { \
+		/* replay the system call when we are done */ \
+		regs->u_regs[UREG_I0] = cp->orig_i0; \
+		regs->pc -= 4; \
+		regs->npc -= 4; \
+		cp->restart_syscall = 0; \
+	} \
+	if (cp->restart_syscall && \
+	    regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) { \
+		regs->u_regs[UREG_G1] = __NR_restart_syscall; \
+		regs->pc -= 4; \
+		regs->npc -= 4; \
+		cp->restart_syscall = 0; \
+	} \
+} while (0)
+
 
 #endif /* !(__ASSEMBLY__) */
 

include/asm-sparc64/signal.h

@@ -245,7 +245,32 @@ typedef struct sigaltstack32 {
 	compat_size_t		ss_size;
 } stack_t32;
 
-#define HAVE_ARCH_GET_SIGNAL_TO_DELIVER
+struct signal_deliver_cookie {
+	int restart_syscall;
+	unsigned long orig_i0;
+};
+
+#define ptrace_signal_deliver(REGS, COOKIE) \
+do {	struct signal_deliver_cookie *cp = (COOKIE); \
+	if (cp->restart_syscall && \
+	    (regs->u_regs[UREG_I0] == ERESTARTNOHAND || \
+	     regs->u_regs[UREG_I0] == ERESTARTSYS || \
+	     regs->u_regs[UREG_I0] == ERESTARTNOINTR)) { \
+		/* replay the system call when we are done */ \
+		regs->u_regs[UREG_I0] = cp->orig_i0; \
+		regs->tpc -= 4; \
+		regs->tnpc -= 4; \
+		cp->restart_syscall = 0; \
+	} \
+	if (cp->restart_syscall && \
+	    regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) { \
+		regs->u_regs[UREG_G1] = __NR_restart_syscall; \
+		regs->tpc -= 4; \
+		regs->tnpc -= 4; \
+		cp->restart_syscall = 0; \
+	} \
+} while (0)
+
 #define HAVE_ARCH_SYS_PAUSE
 
 #endif

include/asm-v850/signal.h

@@ -188,6 +188,8 @@ typedef struct sigaltstack {
 #include <asm/sigcontext.h>
 #undef __HAVE_ARCH_SIG_BITOPS
 
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
+
 #endif /* __KERNEL__ */
 
 #endif /* __V850_SIGNAL_H__ */

include/asm-x86_64/signal.h

@@ -200,6 +200,9 @@ extern __inline__ int sigfindinword(unsigned long word)
 }
 #endif
 #endif
+
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
+
 #endif /* __KERNEL__ */
 
 #endif

include/linux/signal.h

@@ -208,7 +208,7 @@ extern int sigprocmask(int, sigset_t *, sigset_t *);
 
 #ifndef HAVE_ARCH_GET_SIGNAL_TO_DELIVER
 struct pt_regs;
-extern int get_signal_to_deliver(siginfo_t *info, struct pt_regs *regs);
+extern int get_signal_to_deliver(siginfo_t *info, struct pt_regs *regs, void *cookie);
 #endif
 
 #endif /* __KERNEL__ */

kernel/signal.c

@@ -1393,7 +1393,7 @@ do_signal_stop(int signr)
 
 #ifndef HAVE_ARCH_GET_SIGNAL_TO_DELIVER
 
-int get_signal_to_deliver(siginfo_t *info, struct pt_regs *regs)
+int get_signal_to_deliver(siginfo_t *info, struct pt_regs *regs, void *cookie)
 {
 	sigset_t *mask = &current->blocked;
 
@@ -1431,6 +1431,8 @@ int get_signal_to_deliver(siginfo_t *info, struct pt_regs *regs)
 			break;
 
 		if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) {
+			ptrace_signal_deliver(regs, cookie);
+
 			/*
 			 * If there is a group stop in progress,
 			 * we must participate in the bookkeeping.