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/blackfin/kernel | |
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/blackfin/kernel')
-rw-r--r-- | arch/blackfin/kernel/signal.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/signal.c b/arch/blackfin/kernel/signal.c index e5bbc1a5edc2..fc9ecce8b6ce 100644 --- a/arch/blackfin/kernel/signal.c +++ b/arch/blackfin/kernel/signal.c | |||
@@ -336,8 +336,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs) | |||
336 | if (test_thread_flag(TIF_NOTIFY_RESUME)) { | 336 | if (test_thread_flag(TIF_NOTIFY_RESUME)) { |
337 | clear_thread_flag(TIF_NOTIFY_RESUME); | 337 | clear_thread_flag(TIF_NOTIFY_RESUME); |
338 | tracehook_notify_resume(regs); | 338 | tracehook_notify_resume(regs); |
339 | if (current->replacement_session_keyring) | ||
340 | key_replace_session_keyring(); | ||
341 | } | 339 | } |
342 | } | 340 | } |
343 | 341 | ||