---

yaml --- r: 42648 b: refs/heads/master c: f2a2a71 h: refs/heads/master v: v3
git-mirror · Dec 7, 2006 · e86ce11 · e86ce11
1 parent a3cf061
commit e86ce11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3af38d30c18538d069a95e624a3db7c3d486a1e
+refs/heads/master: f2a2a7108aa0039ba7a5fe7a0d2ecef2219a7584
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -323,11 +323,12 @@ static int oom_kill_task(struct task_struct *p)
 
 	/*
 	 * kill all processes that share the ->mm (i.e. all threads),
-	 * but are in a different thread group.
+	 * but are in a different thread group. Don't let them have access
+	 * to memory reserves though, otherwise we might deplete all memory.
 	 */
 	do_each_thread(g, q) {
 		if (q->mm == mm && q->tgid != p->tgid)
-			__oom_kill_task(q, 1);
+			force_sig(SIGKILL, p);
 	} while_each_thread(g, q);
 
 	return 0;