diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-02-24 15:55:28 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-02-24 15:55:28 +0100 |
commit | a1fb6696c662920f695c97591d759391aca8a1ad (patch) | |
tree | 25cc9ca4d1d291e122ff694dd41a9cc6d6513f60 /arch/s390/kernel/compat_signal.c | |
parent | 1f40a8bfa91adfa8d1ac5013c08c76f6fd6691ad (diff) | |
parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
download | blackbird-op-linux-a1fb6696c662920f695c97591d759391aca8a1ad.tar.gz blackbird-op-linux-a1fb6696c662920f695c97591d759391aca8a1ad.zip |
Merge tag 'v4.0-rc1' into x86/mm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/kernel/compat_signal.c')
-rw-r--r-- | arch/s390/kernel/compat_signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c index 34d5fa7b01b5..bc1df12dd4f8 100644 --- a/arch/s390/kernel/compat_signal.c +++ b/arch/s390/kernel/compat_signal.c @@ -209,7 +209,7 @@ static int restore_sigregs32(struct pt_regs *regs,_sigregs32 __user *sregs) int i; /* Alwys make any pending restarted system call return -EINTR */ - current_thread_info()->restart_block.fn = do_no_restart_syscall; + current->restart_block.fn = do_no_restart_syscall; if (__copy_from_user(&user_sregs, &sregs->regs, sizeof(user_sregs))) return -EFAULT; |