diff options
| author | KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> | 2010-08-09 17:19:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-09 20:45:01 -0700 |
| commit | 113e27f36dff9895049df324f292474854750d21 (patch) | |
| tree | 5e4e0bcee4d26ff15123d10d7d86db1eb1c382c8 | |
| parent | 26ebc984913b6a8d86d724b3a79d2ed4ed574612 (diff) | |
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>
| -rw-r--r-- | mm/oom_kill.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 867bd26274b..011181ed41e 100644 --- a/mm/oom_kill.c +++ b/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; |