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

Merge branch 'master' into next

Browse Source 
Conflicts:
	security/Kconfig

Manual fix.

Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
James Morris
2009-08-20 09:18:42 +10:00
parent b08dc3eba0 6c30c53fd5
commit ece13879e7
358 changed files with 4136 additions and 2151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/sched.h
View File

@@ -1198,6 +1198,7 @@ struct task_struct {
* a short time
*/
unsigned char fpu_counter;
s8 oomkilladj; /* OOM kill score adjustment (bit shift). */
#ifdef CONFIG_BLK_DEV_IO_TRACE
unsigned int btrace_seq;
#endif