lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Conflicts:
	arch/sh/kernel/vmlinux.lds.S
This commit is contained in:
Paul Mundt
2009-09-16 13:48:32 +09:00
parent a6f15ade97 0cb583fd28
commit ea88023b34
3897 changed files with 316200 additions and 138946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/kernel/signal_64.c
View File

@@ -760,5 +760,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 (current->replacement_session_keyring)
key_replace_session_keyring();
}
}