From 283318b1d7da2be9d44f75c02b831342e9e83193 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@snapgear.com>
Date: Tue, 23 Oct 2007 14:37:54 +1000
Subject: [PATCH] --- yaml --- r: 72161 b: refs/heads/master c:
 dbf18c8f62cd87473d6db8c16afe4207bc370d3e h: refs/heads/master i:   72159:
 e329fae7f62f33626e063ee30a1966d4548c6e76 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/m68knommu/kernel/signal.c | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d6cf8a9eee1f..6d91c66d7411 100644
--- 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
index 437f8c6c14a0..70371378db86 100644
--- 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;
 }