X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=mm%2Foom_kill.c;h=626303b52f3ce0764d3bb1029f6bce8b5bcaa896;hb=1ddcb218b5920fb20c2b3f029f0189568c2dc6e2;hp=eafff89b3dd634e8836842005695c1ad48cc0cb2;hpb=5fd00b031530cc476240f654c078c930f1dcd6ea;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index eafff89b3dd6..626303b52f3c 100644
--- a/mm/oom_kill.c
+++ b/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) {
 			/*