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/m68k | |
| parent | TIF_NOTIFY_RESUME is defined on all targets now (diff) | |
| download | linux-dev-a42c6ded827dbd396d2efde7530620be029a72d1.tar.xz linux-dev-a42c6ded827dbd396d2efde7530620be029a72d1.zip | |
move key_repace_session_keyring() into tracehook_notify_resume()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/kernel/signal.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index d9f3d1900eed..973eec60cad4 100644 --- a/arch/m68k/kernel/signal.c +++ b/arch/m68k/kernel/signal.c @@ -1193,9 +1193,6 @@ void do_notify_resume(struct pt_regs *regs) 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(); - } } |