---

yaml --- r: 72161 b: refs/heads/master c: dbf18c8 h: refs/heads/master i: 72159: e329fae v: v3
git-mirror · Oct 23, 2007 · 283318b · 283318b
1 parent 0478bb4
commit 283318b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ada8d218cc951c424e677845a44f72b4ab55a7a7
+refs/heads/master: dbf18c8f62cd87473d6db8c16afe4207bc370d3e
diff --git a/trunk/arch/m68knommu/kernel/signal.c b/trunk/arch/m68knommu/kernel/signal.c
@@ -781,15 +781,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs)
 	/* Did we come from a system call? */
 	if (regs->orig_d0 >= 0) {
 		/* Restart the system call - no handlers present */
-		if (regs->d0 == -ERESTARTNOHAND
-		    || regs->d0 == -ERESTARTSYS
-		    || regs->d0 == -ERESTARTNOINTR) {
-			regs->d0 = regs->orig_d0;
-			regs->pc -= 2;
-		} else if (regs->d0 == -ERESTART_RESTARTBLOCK) {
-			regs->d0 = __NR_restart_syscall;
-			regs->pc -= 2;
-		}
+		handle_restart(regs, NULL, 0);
 	}
 	return 0;
 }