Merge branch 'master' into for-linus

2009-08-20 20:24:33 +02:00
parent af15c1addf 6c30c53fd5
commit 39cf0518d8
59 changed files with 724 additions and 459 deletions
@@ -240,8 +240,6 @@ struct mm_struct {

 	unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */

-	s8 oom_adj;	/* OOM kill score adjustment (bit shift) */
-
 	cpumask_t cpu_vm_mask;

 	/* Architecture-specific MM context */
@@ -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