---

yaml --- r: 207257 b: refs/heads/master c: 113e27f h: refs/heads/master i: 207255: db37c54 v: v3
git-mirror · Aug 10, 2010 · ae0bdee · ae0bdee
1 parent 832c3e5
commit ae0bdee
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26ebc984913b6a8d86d724b3a79d2ed4ed574612
+refs/heads/master: 113e27f36dff9895049df324f292474854750d21
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -350,9 +350,6 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
 			*ppoints = ULONG_MAX;
 		}
 
-		if (p->signal->oom_adj == OOM_DISABLE)
-			continue;
-
 		points = badness(p, mem, nodemask, uptime.tv_sec);
 		if (points > *ppoints || !chosen) {
 			chosen = p;