diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-04 00:35:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-04 00:35:43 -0500 |
| commit | d2c032e3dc58137a7261a7824d3acce435db1d66 (patch) | |
| tree | 7eea1c7c6103eefe879f07472eec99b3c41eb792 /arch/x86/ia32 | |
| parent | 7e8e385aaf6ed5b64b5d9108081cfcdcdd021b78 (diff) | |
| parent | 13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff) | |
Merge tag 'v4.0-rc2' into x86/asm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/ia32')
| -rw-r--r-- | arch/x86/ia32/ia32_signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c index f9e181aaba97..d0165c9a2932 100644 --- a/arch/x86/ia32/ia32_signal.c +++ b/arch/x86/ia32/ia32_signal.c | |||
| @@ -169,7 +169,7 @@ static int ia32_restore_sigcontext(struct pt_regs *regs, | |||
| 169 | u32 tmp; | 169 | u32 tmp; |
| 170 | 170 | ||
| 171 | /* Always make any pending restarted system calls return -EINTR */ | 171 | /* Always make any pending restarted system calls return -EINTR */ |
| 172 | current_thread_info()->restart_block.fn = do_no_restart_syscall; | 172 | current->restart_block.fn = do_no_restart_syscall; |
| 173 | 173 | ||
| 174 | get_user_try { | 174 | get_user_try { |
| 175 | /* | 175 | /* |