aboutsummaryrefslogtreecommitdiffstats
path: root/arch/frv
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-05-23 14:44:37 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-05-23 22:09:20 -0400
commita42c6ded827dbd396d2efde7530620be029a72d1 (patch)
treeea3129404f32515a04497990a050b2cf73aa1d5d /arch/frv
parent1227dd773d8d4e3983b4b751f9ffa0f41402fb7c (diff)
move key_repace_session_keyring() into tracehook_notify_resume()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/frv')
-rw-r--r--arch/frv/kernel/signal.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index 8cf5dca01758..595bf1e5a5dc 100644
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -562,8 +562,6 @@ asmlinkage void do_notify_resume(__u32 thread_info_flags)
562 if (thread_info_flags & _TIF_NOTIFY_RESUME) { 562 if (thread_info_flags & _TIF_NOTIFY_RESUME) {
563 clear_thread_flag(TIF_NOTIFY_RESUME); 563 clear_thread_flag(TIF_NOTIFY_RESUME);
564 tracehook_notify_resume(__frame); 564 tracehook_notify_resume(__frame);
565 if (current->replacement_session_keyring)
566 key_replace_session_keyring();
567 } 565 }
568 566
569} /* end do_notify_resume() */ 567} /* end do_notify_resume() */