From 5016c6e88b5848efe70c2fdcb0d6d608528a7403 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Mon, 20 Sep 2010 15:13:25 +0100
Subject: [PATCH] --- yaml --- r: 210841 b: refs/heads/master c:
 ed1cde68365c1251b920900c51e73675ff38dc66 h: refs/heads/master i:   210839:
 9f3b5995423127ee4bb64259be9e379e81cebb41 v: v3

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

diff --git a/[refs] b/[refs]
index 959d545124c4..dd1b6d70671f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44c7afffa429a7cdcd1755019ab76566ff41e66d
+refs/heads/master: ed1cde68365c1251b920900c51e73675ff38dc66
diff --git a/trunk/arch/frv/kernel/signal.c b/trunk/arch/frv/kernel/signal.c
index bd13b57a5c9b..bab01298b58e 100644
--- a/trunk/arch/frv/kernel/signal.c
+++ b/trunk/arch/frv/kernel/signal.c
@@ -446,7 +446,7 @@ static int handle_signal(unsigned long sig, siginfo_t *info,
 	int ret;
 
 	/* Are we from a system call? */
-	if (in_syscall(__frame)) {
+	if (__frame->syscallno != -1) {
 		/* If so, check system call restarting.. */
 		switch (__frame->gr8) {
 		case -ERESTART_RESTARTBLOCK:
@@ -465,6 +465,7 @@ static int handle_signal(unsigned long sig, siginfo_t *info,
 			__frame->gr8 = __frame->orig_gr8;
 			__frame->pc -= 4;
 		}
+		__frame->syscallno = -1;
 	}
 
 	/* Set up the stack frame */
@@ -551,6 +552,7 @@ static void do_signal(void)
 			__frame->pc -= 4;
 			break;
 		}
+		__frame->syscallno = -1;
 	}
 
 	/* if there's no signal to deliver, we just put the saved sigmask