---

yaml --- r: 272115 b: refs/heads/master c: f660daa h: refs/heads/master i: 272113: 3c04cf4 272111: 2801ddf v: v3
git-mirror · Nov 1, 2011 · 992c2c7 · 992c2c7
1 parent 95bb87a
commit 992c2c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d08c429b06d21bd2add88aea2cd1996f1b9b3bda
+refs/heads/master: f660daac474c6f7c2d710100e29b3276a6f4db0a
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -32,6 +32,7 @@
 #include <linux/mempolicy.h>
 #include <linux/security.h>
 #include <linux/ptrace.h>
+#include <linux/freezer.h>
 
 int sysctl_panic_on_oom;
 int sysctl_oom_kill_allocating_task;
@@ -317,8 +318,11 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
 		 * blocked waiting for another task which itself is waiting
 		 * for memory. Is there a better alternative?
 		 */
-		if (test_tsk_thread_flag(p, TIF_MEMDIE))
+		if (test_tsk_thread_flag(p, TIF_MEMDIE)) {
+			if (unlikely(frozen(p)))
+				thaw_process(p);
 			return ERR_PTR(-1UL);
+		}
 		if (!p->mm)
 			continue;