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/powerpc | |
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/powerpc')
-rw-r--r-- | arch/powerpc/kernel/signal.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c index 651c5963662b..bfc3ec1382fb 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c | |||
@@ -193,8 +193,6 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags) | |||
193 | if (thread_info_flags & _TIF_NOTIFY_RESUME) { | 193 | if (thread_info_flags & _TIF_NOTIFY_RESUME) { |
194 | clear_thread_flag(TIF_NOTIFY_RESUME); | 194 | clear_thread_flag(TIF_NOTIFY_RESUME); |
195 | tracehook_notify_resume(regs); | 195 | tracehook_notify_resume(regs); |
196 | if (current->replacement_session_keyring) | ||
197 | key_replace_session_keyring(); | ||
198 | } | 196 | } |
199 | } | 197 | } |
200 | 198 | ||