aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa
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/xtensa
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/xtensa')
-rw-r--r--arch/xtensa/kernel/signal.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index c5e4ec0598d2..ea7e17778a75 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -548,9 +548,6 @@ void do_notify_resume(struct pt_regs *regs)
548 if (test_thread_flag(TIF_SIGPENDING)) 548 if (test_thread_flag(TIF_SIGPENDING))
549 do_signal(regs); 549 do_signal(regs);
550 550
551 if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) { 551 if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
552 tracehook_notify_resume(regs); 552 tracehook_notify_resume(regs);
553 if (current->replacement_session_keyring)
554 key_replace_session_keyring();
555 }
556} 553}