From 43d7dfc8b82331b038ceea668dc518ba7cb7ff9e Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Thu, 19 Aug 2010 14:13:38 -0700
Subject: [PATCH] --- yaml --- r: 209681 b: refs/heads/master c:
 be71cf2202971e50ce4953d473649c724799eb8a h: refs/heads/master i:   209679:
 018a10d990fc5fc32511c53971790c55539b4a6d v: v3

---
 [refs]              | 2 +-
 trunk/mm/oom_kill.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bbd043f4aa41..170ed73d4771 100644
--- 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
index 5014e50644d1..17d48a67e7b7 100644
--- 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)),