diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-23 14:44:37 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-23 22:09:20 -0400 |
| commit | a42c6ded827dbd396d2efde7530620be029a72d1 (patch) | |
| tree | ea3129404f32515a04497990a050b2cf73aa1d5d /arch/tile | |
| parent | 1227dd773d8d4e3983b4b751f9ffa0f41402fb7c (diff) | |
move key_repace_session_keyring() into tracehook_notify_resume()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/tile')
| -rw-r--r-- | arch/tile/kernel/process.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c index f572c19c408..32817ab6062 100644 --- a/arch/tile/kernel/process.c +++ b/arch/tile/kernel/process.c | |||
| @@ -569,8 +569,6 @@ int do_work_pending(struct pt_regs *regs, u32 thread_info_flags) | |||
| 569 | if (thread_info_flags & _TIF_NOTIFY_RESUME) { | 569 | if (thread_info_flags & _TIF_NOTIFY_RESUME) { |
| 570 | clear_thread_flag(TIF_NOTIFY_RESUME); | 570 | clear_thread_flag(TIF_NOTIFY_RESUME); |
| 571 | tracehook_notify_resume(regs); | 571 | tracehook_notify_resume(regs); |
| 572 | if (current->replacement_session_keyring) | ||
| 573 | key_replace_session_keyring(); | ||
| 574 | return 1; | 572 | return 1; |
| 575 | } | 573 | } |
| 576 | if (thread_info_flags & _TIF_SINGLESTEP) { | 574 | if (thread_info_flags & _TIF_SINGLESTEP) { |