diff options
author | David Rientjes <rientjes@google.com> | 2007-04-24 00:36:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-24 11:11:49 -0400 |
commit | 650a7c974f1b91de9732c0f720e792837f8abfd6 (patch) | |
tree | c1f3b166e7128a4b0c35a4f900ad5cd6c959b4a2 | |
parent | c445a31cd7f469d77acc37538ab43a99530968b8 (diff) |
oom: kill all threads that share mm with killed task
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>
-rw-r--r-- | mm/oom_kill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 2f3916986abf..af981b645a69 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
@@ -333,7 +333,7 @@ static int oom_kill_task(struct task_struct *p) | |||
333 | */ | 333 | */ |
334 | do_each_thread(g, q) { | 334 | do_each_thread(g, q) { |
335 | if (q->mm == mm && q->tgid != p->tgid) | 335 | if (q->mm == mm && q->tgid != p->tgid) |
336 | force_sig(SIGKILL, p); | 336 | force_sig(SIGKILL, q); |
337 | } while_each_thread(g, q); | 337 | } while_each_thread(g, q); |
338 | 338 | ||
339 | return 0; | 339 | return 0; |