diff --git a/[refs] b/[refs] index 7a25aceb0cb6..59cb3946ca92 100644 --- 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 index 867bd26274b4..011181ed41e3 100644 --- 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;