Commit 113e27f3 authored Aug 09, 2010 by KOSAKI Motohiro Committed by Linus Torvalds Aug 09, 2010

oom: kill duplicate OOM_DISABLE check



select_bad_process() and badness() have the same OOM_DISABLE check.  This
patch kills one.

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
Cc: David Rientjes <rientjes@google.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 26ebc984

mm/oom_kill.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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;