diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-22 03:35:28 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-21 23:52:39 -0400 |
| commit | 188f677f84e935f83e3d539d6e8808006f6ac62f (patch) | |
| tree | 7fece57bab86bf31d46076322285bf639df8f401 /arch/xtensa | |
| parent | f2ccfb3e565f51f1063d68f119d5b42a7f5fd984 (diff) | |
| download | linux-3.10-188f677f84e935f83e3d539d6e8808006f6ac62f.tar.gz linux-3.10-188f677f84e935f83e3d539d6e8808006f6ac62f.tar.bz2 linux-3.10-188f677f84e935f83e3d539d6e8808006f6ac62f.zip | |
xtensa: ->restart_block.fn needs to be reset on rt_sigreturn
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/kernel/signal.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c index d78869a00b1..44e9329a648 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"); |