diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 00:48:32 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 00:48:32 -0400 |
| commit | ea88023b3491a384575ebcd5e8a449e841a28a24 (patch) | |
| tree | f46e3d8302e44dc55ce31823501e100472d29683 /arch/sh/kernel/signal_32.c | |
| parent | a6f15ade97989d414e9bf33874c9d5d1f39808ec (diff) | |
| parent | 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/vmlinux.lds.S
Diffstat (limited to 'arch/sh/kernel/signal_32.c')
| -rw-r--r-- | arch/sh/kernel/signal_32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c index 6010750c90b4..6729703547a1 100644 --- a/arch/sh/kernel/signal_32.c +++ b/arch/sh/kernel/signal_32.c | |||
| @@ -650,5 +650,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned int save_r0, | |||
| 650 | if (thread_info_flags & _TIF_NOTIFY_RESUME) { | 650 | if (thread_info_flags & _TIF_NOTIFY_RESUME) { |
| 651 | clear_thread_flag(TIF_NOTIFY_RESUME); | 651 | clear_thread_flag(TIF_NOTIFY_RESUME); |
| 652 | tracehook_notify_resume(regs); | 652 | tracehook_notify_resume(regs); |
| 653 | if (current->replacement_session_keyring) | ||
| 654 | key_replace_session_keyring(); | ||
| 653 | } | 655 | } |
| 654 | } | 656 | } |