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/microblaze | |
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/microblaze')
-rw-r--r-- | arch/microblaze/kernel/signal.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c index 7f4c7bef1642..5d796e32786e 100644 --- a/arch/microblaze/kernel/signal.c +++ b/arch/microblaze/kernel/signal.c | |||
@@ -401,9 +401,6 @@ void do_notify_resume(struct pt_regs *regs, int in_syscall) | |||
401 | if (test_thread_flag(TIF_SIGPENDING)) | 401 | if (test_thread_flag(TIF_SIGPENDING)) |
402 | do_signal(regs, in_syscall); | 402 | do_signal(regs, in_syscall); |
403 | 403 | ||
404 | if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) { | 404 | if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) |
405 | tracehook_notify_resume(regs); | 405 | tracehook_notify_resume(regs); |
406 | if (current->replacement_session_keyring) | ||
407 | key_replace_session_keyring(); | ||
408 | } | ||
409 | } | 406 | } |