aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>2010-08-09 20:19:39 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-09 23:45:02 -0400
commit19b4586cd9c8ed642798902e55c6f61ed576ad93 (patch)
tree9db6c100cbb1337b584e0b7011ee1c736a210cd0
parentdf1090a8dda40b6e11d8cd09e8fc900cfe913b38 (diff)
oom: remove child->mm check from oom_kill_process()
The current "child->mm == p->mm" check prevents selection of vfork()ed task. But we don't have any reason to don't consider vfork(). Removed. Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: 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.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 342d4333f718..942861bf9177 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -479,9 +479,6 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
479 list_for_each_entry(child, &t->children, sibling) { 479 list_for_each_entry(child, &t->children, sibling) {
480 unsigned long child_points; 480 unsigned long child_points;
481 481
482 if (child->mm == p->mm)
483 continue;
484
485 /* badness() returns 0 if the thread is unkillable */ 482 /* badness() returns 0 if the thread is unkillable */
486 child_points = badness(child, mem, nodemask, 483 child_points = badness(child, mem, nodemask,
487 uptime.tv_sec); 484 uptime.tv_sec);