commit a42c6ded827dbd396d2efde7530620be029a72d1
author Al Viro <viro@zeniv.linux.org.uk> Wed May 23 14:44:37 2012 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Wed May 23 22:09:20 2012 -0400
tree ea3129404f32515a04497990a050b2cf73aa1d5d
parent 1227dd773d8d4e3983b4b751f9ffa0f41402fb7c

move key_repace_session_keyring() into tracehook_notify_resume()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

arch/xtensa/kernel/signal.c

diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index c5e4ec0..ea7e177 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -548,9 +548,6 @@
 	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();
-	}
 }