]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[PATCH] oom: kill all threads that share mm with killed task
authorDavid Rientjes <rientjes@google.com>
Fri, 27 Apr 2007 16:11:10 +0000 (12:11 -0400)
committerChris Wright <chrisw@sous-sol.org>
Mon, 11 Jun 2007 18:37:08 +0000 (11:37 -0700)
oom_kill_task() calls __oom_kill_task() to OOM kill a selected task.
When finding other threads that share an mm with that task, we need to
kill those individual threads and not the same one.

(Bug introduced by f2a2a7108aa0039ba7a5fe7a0d2ecef2219a7584)

Acked-by: William Irwin <bill.irwin@oracle.com>
Acked-by: Christoph Lameter <clameter@engr.sgi.com>
Cc: Nick Piggin <npiggin@suse.de>
Cc: Andrew Morton <akpm@osdl.org>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
mm/oom_kill.c

index 223add31d2edee052363b5df7491fa38015d9fe1..3791edfffeebe9595f54ce7d04fe424832aa6af5 100644 (file)
@@ -335,7 +335,7 @@ static int oom_kill_task(struct task_struct *p)
         */
        do_each_thread(g, q) {
                if (q->mm == mm && q->tgid != p->tgid)
-                       force_sig(SIGKILL, p);
+                       force_sig(SIGKILL, q);
        } while_each_thread(g, q);
 
        return 0;