From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 22 Apr 2012 07:35:28 +0000 (-0400)
Subject: xtensa: ->restart_block.fn needs to be reset on rt_sigreturn
X-Git-Tag: firefly_0821_release~3680^2~2783^2~28
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=188f677f84e935f83e3d539d6e8808006f6ac62f;p=firefly-linux-kernel-4.4.55.git

xtensa: ->restart_block.fn needs to be reset on rt_sigreturn

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index d78869a00b11..44e9329a6484 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -248,6 +248,9 @@ asmlinkage long xtensa_rt_sigreturn(long a0, long a1, long a2, long a3,
 	sigset_t set;
 	int ret;
 
+	/* Always make any pending restarted system calls return -EINTR */
+	current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
 	if (regs->depc > 64)
 		panic("rt_sigreturn in double exception!\n");