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/um/kernel/process.c

diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 3a2235e..ccb9a9d 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -117,11 +117,8 @@
 		schedule();
 	if (test_thread_flag(TIF_SIGPENDING))
 		do_signal();
-	if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) {
+	if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
 		tracehook_notify_resume(&current->thread.regs);
-		if (current->replacement_session_keyring)
-			key_replace_session_keyring();
-	}
 }
 
 void exit_thread(void)