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/s390 | |
| 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/s390')
| -rw-r--r-- | arch/s390/kernel/signal.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c index f626232e216c..42a6e8b47f06 100644 --- a/arch/s390/kernel/signal.c +++ b/arch/s390/kernel/signal.c | |||
| @@ -494,6 +494,4 @@ void do_notify_resume(struct pt_regs *regs) | |||
| 494 | { | 494 | { |
| 495 | clear_thread_flag(TIF_NOTIFY_RESUME); | 495 | clear_thread_flag(TIF_NOTIFY_RESUME); |
| 496 | tracehook_notify_resume(regs); | 496 | tracehook_notify_resume(regs); |
| 497 | if (current->replacement_session_keyring) | ||
| 498 | key_replace_session_keyring(); | ||
| 499 | } | 497 | } |