---

yaml --- r: 275478 b: refs/heads/master c: 5aecc85 h: refs/heads/master v: v3
git-mirror · Nov 16, 2011 · e411689 · e411689
1 parent 2f81db2
commit e411689
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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.