From 1015b771762856f0f9f7e0edacbf49725fb36532 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 20 Sep 2010 15:13:04 +0100 Subject: [PATCH] --- yaml --- r: 210837 b: refs/heads/master c: 20cd514d0f3d288d968217028ca67b70e707d896 h: refs/heads/master i: 210835: 1bfb4edb6e837027403378716401d62f02b7d41e v: v3 --- [refs] | 2 +- trunk/arch/frv/kernel/signal.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 69e6cb17f197..70173b37ca80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31c4a3d3a0f84a5847665f8aa0552d188389f791 +refs/heads/master: 20cd514d0f3d288d968217028ca67b70e707d896 diff --git a/trunk/arch/frv/kernel/signal.c b/trunk/arch/frv/kernel/signal.c index 0974c0ecc594..7fc29615ef01 100644 --- a/trunk/arch/frv/kernel/signal.c +++ b/trunk/arch/frv/kernel/signal.c @@ -121,6 +121,9 @@ static int restore_sigcontext(struct sigcontext __user *sc, int *_gr8) struct user_context *user = current->thread.user; unsigned long tbr, psr; + /* Always make any pending restarted system calls return -EINTR */ + current_thread_info()->restart_block.fn = do_no_restart_syscall; + tbr = user->i.tbr; psr = user->i.psr; if (copy_from_user(user, &sc->sc_context, sizeof(sc->sc_context)))