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 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
signal.c
diff --git
a/arch/s390/kernel/signal.c
b/arch/s390/kernel/signal.c
index
062bd64
..
6b4fef8
100644
(file)
--- a/
arch/s390/kernel/signal.c
+++ b/
arch/s390/kernel/signal.c
@@
-536,4
+536,6
@@
void do_notify_resume(struct pt_regs *regs)
{
clear_thread_flag(TIF_NOTIFY_RESUME);
tracehook_notify_resume(regs);
+ if (current->replacement_session_keyring)
+ key_replace_session_keyring();
}