leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oom: kill duplicate OOM_DISABLE check

Browse Source 
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:
KOSAKI Motohiro 2010-08-09 17:19:37 -07:00 committed by Linus Torvalds
parent 26ebc98491
commit 113e27f36d
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mm/oom_kill.c
View File

@ -350,9 +350,6 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
*ppoints = ULONG_MAX; *ppoints = ULONG_MAX;
} }
if (p->signal->oom_adj == OOM_DISABLE)
continue;
points = badness(p, mem, nodemask, uptime.tv_sec); points = badness(p, mem, nodemask, uptime.tv_sec);
if (points > *ppoints || !chosen) { if (points > *ppoints || !chosen) {
chosen = p; chosen = p;