X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=mm%2Foom_kill.c;h=0a4ca8a0234b5da6696235dd79c15ea1ed046a8f;hp=31bd0c344fa771cb31a5479cbde4d7983678f614;hb=cef1d3523d33ebc35fc29e454b1f4bab953fabbf;hpb=93b43fa55088fe977503a156d1097cc2055449a2

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 31bd0c344fa7..0a4ca8a0234b 100644
--- a/mm/oom_kill.c
+++ b/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);