forked from Minki/linux
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>
This commit is contained in:
parent
26ebc98491
commit
113e27f36d
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user