git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
signal_32.c
diff --git
a/arch/sh/kernel/signal_32.c
b/arch/sh/kernel/signal_32.c
index
b5afbec
..
04a2188
100644
(file)
--- a/
arch/sh/kernel/signal_32.c
+++ b/
arch/sh/kernel/signal_32.c
@@
-640,5
+640,7
@@
asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned int save_r0,
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
clear_thread_flag(TIF_NOTIFY_RESUME);
tracehook_notify_resume(regs);
+ if (current->replacement_session_keyring)
+ key_replace_session_keyring();
}
}