[SPARC]: ADd ERESTART_RESTARTBLOCK signal return handling.

arch/sparc/kernel/signal.c

@@ -1019,19 +1019,22 @@ static inline void syscall_restart(unsigned long orig_i0, struct pt_regs *regs,
 				   struct sigaction *sa)
 {
 	switch(regs->u_regs[UREG_I0]) {
-		case ERESTARTNOHAND:
-		no_system_call_restart:
-			regs->u_regs[UREG_I0] = EINTR;
-			regs->psr |= PSR_C;
-			break;
-		case ERESTARTSYS:
-			if(!(sa->sa_flags & SA_RESTART))
-				goto no_system_call_restart;
+	case ERESTART_RESTARTBLOCK:
+		current_thread_info()->restart_block.fn = do_no_restart_syscall;
+		/* fallthrough */
+	case ERESTARTNOHAND:
+	no_system_call_restart:
+		regs->u_regs[UREG_I0] = EINTR;
+		regs->psr |= PSR_C;
+		break;
+	case ERESTARTSYS:
+		if(!(sa->sa_flags & SA_RESTART))
+			goto no_system_call_restart;
 		/* fallthrough */
-		case ERESTARTNOINTR:
-			regs->u_regs[UREG_I0] = orig_i0;
-			regs->pc -= 4;
-			regs->npc -= 4;
+	case ERESTARTNOINTR:
+		regs->u_regs[UREG_I0] = orig_i0;
+		regs->pc -= 4;
+		regs->npc -= 4;
 	}
 }
 
@@ -1084,6 +1087,13 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs * regs,
 				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);
 
@@ -1184,6 +1194,12 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs * regs,
 		regs->pc -= 4;
 		regs->npc -= 4;
 	}
+	if (restart_syscall &&
+	    regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
+		regs->u_regs[UREG_G1] = __NR_restart_syscall;
+		regs->pc -= 4;
+		regs->npc -= 4;
+	}
 	return 0;
 }
 

arch/sparc64/kernel/signal.c

@@ -573,19 +573,22 @@ static inline void syscall_restart(unsigned long orig_i0, struct pt_regs *regs,
 				     struct sigaction *sa)
 {
 	switch (regs->u_regs[UREG_I0]) {
-		case ERESTARTNOHAND:
-		no_system_call_restart:
-			regs->u_regs[UREG_I0] = EINTR;
-			regs->tstate |= (TSTATE_ICARRY|TSTATE_XCARRY);
-			break;
-		case ERESTARTSYS:
-			if (!(sa->sa_flags & SA_RESTART))
-				goto no_system_call_restart;
+	case ERESTART_RESTARTBLOCK:
+		current_thread_info()->restart_block.fn = do_no_restart_syscall;
+		/* fallthrough */
+	case ERESTARTNOHAND:
+	no_system_call_restart:
+		regs->u_regs[UREG_I0] = EINTR;
+		regs->tstate |= (TSTATE_ICARRY|TSTATE_XCARRY);
+		break;
+	case ERESTARTSYS:
+		if (!(sa->sa_flags & SA_RESTART))
+			goto no_system_call_restart;
 		/* fallthrough */
-		case ERESTARTNOINTR:
-			regs->u_regs[UREG_I0] = orig_i0;
-			regs->tpc -= 4;
-			regs->tnpc -= 4;
+	case ERESTARTNOINTR:
+		regs->u_regs[UREG_I0] = orig_i0;
+		regs->tpc -= 4;
+		regs->tnpc -= 4;
 	}
 }
 
@@ -634,6 +637,13 @@ static int do_signal(sigset_t *oldset, struct pt_regs * regs,
 				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);
@@ -727,6 +737,12 @@ static int do_signal(sigset_t *oldset, struct pt_regs * regs,
 		regs->tpc -= 4;
 		regs->tnpc -= 4;
 	}
+	if (restart_syscall &&
+	    regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
+		regs->u_regs[UREG_G1] = __NR_restart_syscall;
+		regs->tpc -= 4;
+		regs->tnpc -= 4;
+	}
 	return 0;
 }
 

arch/sparc64/kernel/signal32.c

@@ -1253,19 +1253,22 @@ static inline void syscall_restart32(unsigned long orig_i0, struct pt_regs *regs
 				     struct sigaction *sa)
 {
 	switch (regs->u_regs[UREG_I0]) {
-		case ERESTARTNOHAND:
-		no_system_call_restart:
-			regs->u_regs[UREG_I0] = EINTR;
-			regs->tstate |= TSTATE_ICARRY;
-			break;
-		case ERESTARTSYS:
-			if (!(sa->sa_flags & SA_RESTART))
-				goto no_system_call_restart;
+	case ERESTART_RESTARTBLOCK:
+		current_thread_info()->restart_block.fn = do_no_restart_syscall;
+		/* fallthrough */
+	case ERESTARTNOHAND:
+	no_system_call_restart:
+		regs->u_regs[UREG_I0] = EINTR;
+		regs->tstate |= TSTATE_ICARRY;
+		break;
+	case ERESTARTSYS:
+		if (!(sa->sa_flags & SA_RESTART))
+			goto no_system_call_restart;
 		/* fallthrough */
-		case ERESTARTNOINTR:
-			regs->u_regs[UREG_I0] = orig_i0;
-			regs->tpc -= 4;
-			regs->tnpc -= 4;
+	case ERESTARTNOINTR:
+		regs->u_regs[UREG_I0] = orig_i0;
+		regs->tpc -= 4;
+		regs->tnpc -= 4;
 	}
 }
 
@@ -1306,6 +1309,13 @@ int do_signal32(sigset_t *oldset, struct pt_regs * regs,
 				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);
@@ -1398,6 +1408,12 @@ int do_signal32(sigset_t *oldset, struct pt_regs * regs,
 		regs->tpc -= 4;
 		regs->tnpc -= 4;
 	}
+	if (restart_syscall &&
+	    regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) {
+		regs->u_regs[UREG_G1] = __NR_restart_syscall;
+		regs->tpc -= 4;
+		regs->tnpc -= 4;
+	}
 	return 0;
 }