Merge branch 'linus' into core/rcu

Merge reason: Avoid fuzz in init/main.c and update from rc6 to rc8. Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-09-04 09:28:52 +02:00
parent 868489660d 37d0892c5a
commit 29e2035bdd
448 changed files with 5258 additions and 3114 deletions
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@ -1200,6 +1200,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