diff --git a/[refs] b/[refs]
index 7b24569b7b7b..a27bbadfc94f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b43fa55088fe977503a156d1097cc2055449a2
+refs/heads/master: cef1d3523d33ebc35fc29e454b1f4bab953fabbf
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index 31bd0c344fa7..0a4ca8a0234b 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -360,7 +360,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
 		 * the process of exiting and releasing its resources.
 		 * Otherwise we could get an easy OOM deadlock.
 		 */
-		if ((p->flags & PF_EXITING) && p->mm) {
+		if (thread_group_empty(p) && (p->flags & PF_EXITING) && p->mm) {
 			if (p != current)
 				return ERR_PTR(-1UL);