From e4116893da435cf55c152b701bebd6c53723be59 Mon Sep 17 00:00:00 2001
From: Michal Hocko <mhocko@suse.cz>
Date: Tue, 15 Nov 2011 14:36:07 -0800
Subject: [PATCH] --- yaml --- r: 275478 b: refs/heads/master c:
 5aecc85abdb9ac2b0e6548d13652a34142e7ae89 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/mm/oom_kill.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e9cbae34de66..59ce736f77f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 001ef5e4554b851cf50fe03bc4c266c28ed8e62d
+refs/heads/master: 5aecc85abdb9ac2b0e6548d13652a34142e7ae89
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index 471dedb463ab..76f2c5ae908e 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -185,6 +185,11 @@ unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *mem,
 	if (!p)
 		return 0;
 
+	if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN) {
+		task_unlock(p);
+		return 0;
+	}
+
 	/*
 	 * The memory controller may have a limit of 0 bytes, so avoid a divide
 	 * by zero, if necessary.