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 <[email protected]>
Reviewed-by: Minchan Kim <[email protected]>
Cc: David Rientjes <[email protected]>
Cc: KAMEZAWA Hiroyuki <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 867bd26274b4a16ea4d66638a962e9664250405c..011181ed41e3b44fa5f59e9a736b3ce43f53c9ee 100644 (file)
--- 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;