---

yaml --- r: 262166 b: refs/heads/master c: c027a47 h: refs/heads/master v: v3
git-mirror · Aug 2, 2011 · 9270801 · 9270801
1 parent 7dafeec
commit 9270801
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfe22345ad5ef29e192e157fdc3e17d357e4bc24
+refs/heads/master: c027a474a68065391c8773f6e83ed5412657e369
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -303,7 +303,7 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
 	do_each_thread(g, p) {
 		unsigned int points;
 
-		if (!p->mm)
+		if (p->exit_state)
 			continue;
 		if (oom_unkillable_task(p, mem, nodemask))
 			continue;
@@ -319,6 +319,8 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
 		 */
 		if (test_tsk_thread_flag(p, TIF_MEMDIE))
 			return ERR_PTR(-1UL);
+		if (!p->mm)
+			continue;
 
 		if (p->flags & PF_EXITING) {
 			/*