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/m68k | |
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/m68k')
-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 d9f3d1900eed..973eec60cad4 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) | |||
1193 | if (test_thread_flag(TIF_SIGPENDING)) | 1193 | if (test_thread_flag(TIF_SIGPENDING)) |
1194 | do_signal(regs); | 1194 | do_signal(regs); |
1195 | 1195 | ||
1196 | if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) { | 1196 | if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) |
1197 | tracehook_notify_resume(regs); | 1197 | tracehook_notify_resume(regs); |
1198 | if (current->replacement_session_keyring) | ||
1199 | key_replace_session_keyring(); | ||
1200 | } | ||
1201 | } | 1198 | } |