diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-23 18:44:37 (GMT) |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-24 02:09:20 (GMT) |
commit | a42c6ded827dbd396d2efde7530620be029a72d1 (patch) | |
tree | ea3129404f32515a04497990a050b2cf73aa1d5d /arch/m68k/kernel | |
parent | 1227dd773d8d4e3983b4b751f9ffa0f41402fb7c (diff) | |
download | linux-fsl-qoriq-a42c6ded827dbd396d2efde7530620be029a72d1.tar.xz |
move key_repace_session_keyring() into tracehook_notify_resume()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/signal.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index d9f3d19..973eec6 100644 --- a/arch/m68k/kernel/signal.c +++ b/arch/m68k/kernel/signal.c @@ -1193,9 +1193,6 @@ void do_notify_resume(struct pt_regs *regs) if (test_thread_flag(TIF_SIGPENDING)) do_signal(regs); - if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) { + if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) tracehook_notify_resume(regs); - if (current->replacement_session_keyring) - key_replace_session_keyring(); - } } |