---

yaml --- r: 209681 b: refs/heads/master c: be71cf2 h: refs/heads/master i: 209679: 018a10d v: v3
git-mirror · Aug 20, 2010 · 43d7dfc · 43d7dfc
1 parent da8b461
commit 43d7dfc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f522886e202a34a2191dd5d471b3c4d46410a9a0
+refs/heads/master: be71cf2202971e50ce4953d473649c724799eb8a
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -401,10 +401,9 @@ static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order,
 static int oom_kill_task(struct task_struct *p, struct mem_cgroup *mem)
 {
 	p = find_lock_task_mm(p);
-	if (!p) {
-		task_unlock(p);
+	if (!p)
 		return 1;
-	}
+
 	pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
 		task_pid_nr(p), p->comm, K(p->mm->total_vm),
 		K(get_mm_counter(p->mm, MM_ANONPAGES)),