---

yaml --- r: 284375 b: refs/heads/master c: ec0fffd h: refs/heads/master i: 284373: 8d1ab42 284371: cea258e 284367: 4e823b0 v: v3
git-mirror · Jan 13, 2012 · 42b231a · 42b231a
1 parent c77bcc5
commit 42b231a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0527b6903b2838e214c895d527806aefd61b3c8f
+refs/heads/master: ec0fffd84b162e0563a28a81aa049f946b31a8e2
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -434,7 +434,7 @@ static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order,
 }
 
 #define K(x) ((x) << (PAGE_SHIFT-10))
-static int oom_kill_task(struct task_struct *p, struct mem_cgroup *mem)
+static int oom_kill_task(struct task_struct *p)
 {
 	struct task_struct *q;
 	struct mm_struct *mm;
@@ -533,7 +533,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
 		}
 	} while_each_thread(p, t);
 
-	return oom_kill_task(victim, mem);
+	return oom_kill_task(victim);
 }
 
 /*