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/avr32 | |
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/avr32')
-rw-r--r-- | arch/avr32/kernel/signal.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c index ae386c304bee..e7595ef74f51 100644 --- a/arch/avr32/kernel/signal.c +++ b/arch/avr32/kernel/signal.c | |||
@@ -321,7 +321,5 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti) | |||
321 | if (ti->flags & _TIF_NOTIFY_RESUME) { | 321 | if (ti->flags & _TIF_NOTIFY_RESUME) { |
322 | clear_thread_flag(TIF_NOTIFY_RESUME); | 322 | clear_thread_flag(TIF_NOTIFY_RESUME); |
323 | tracehook_notify_resume(regs); | 323 | tracehook_notify_resume(regs); |
324 | if (current->replacement_session_keyring) | ||
325 | key_replace_session_keyring(); | ||
326 | } | 324 | } |
327 | } | 325 | } |