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 branch 'nfs-for-2.6.32'
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
signal_64.c
diff --git
a/arch/sh/kernel/signal_64.c
b/arch/sh/kernel/signal_64.c
index
0663a0e
..
9e5c9b1
100644
(file)
--- a/
arch/sh/kernel/signal_64.c
+++ b/
arch/sh/kernel/signal_64.c
@@
-772,5
+772,7
@@
asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned long thread_info
if (thread_info_flags & _TIF_NOTIFY_RESUME) {
clear_thread_flag(TIF_NOTIFY_RESUME);
tracehook_notify_resume(regs);
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();
}
}
}
}