From 7ed438924b829ac6ef8b58ecb37cd9600ef1cf26 Mon Sep 17 00:00:00 2001 From: KOSAKI Motohiro Date: Mon, 9 Aug 2010 17:19:39 -0700 Subject: [PATCH] --- yaml --- r: 207260 b: refs/heads/master c: 19b4586cd9c8ed642798902e55c6f61ed576ad93 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/oom_kill.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 33210aadc3c5..491dd12a6b28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df1090a8dda40b6e11d8cd09e8fc900cfe913b38 +refs/heads/master: 19b4586cd9c8ed642798902e55c6f61ed576ad93 diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index 342d4333f718..942861bf9177 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/mm/oom_kill.c @@ -479,9 +479,6 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, list_for_each_entry(child, &t->children, sibling) { unsigned long child_points; - if (child->mm == p->mm) - continue; - /* badness() returns 0 if the thread is unkillable */ child_points = badness(child, mem, nodemask, uptime.tv_sec);