oom: oom_kill_process: fix the child_points logic

[mv-sheeva.git] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 7dcca55ede7ca1493df615af994f6ba23c1bb129..b19c78eb74c01948277937e4f88dbbb00c164806 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -458,10 +458,10 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
                            struct mem_cgroup *mem, nodemask_t *nodemask,
                            const char *message)
 {
-       struct task_struct *victim = p;
+       struct task_struct *victim;
        struct task_struct *child;
-       struct task_struct *t = p;
-       unsigned int victim_points = 0;
+       struct task_struct *t;
+       unsigned int victim_points;
 
        if (printk_ratelimit())
                dump_header(p, gfp_mask, order, mem, nodemask);
@@ -487,10 +487,15 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
         * parent.  This attempts to lose the minimal amount of work done while
         * still freeing memory.
         */
+       victim_points = oom_badness(p, mem, nodemask, totalpages);
+       victim = p;
+       t = p;
        do {
                list_for_each_entry(child, &t->children, sibling) {
                        unsigned int child_points;
 
+                       if (child->mm == t->mm)
+                               continue;
                        /*
                         * oom_badness() returns 0 if the thread is unkillable
                         */