diff --git a/[refs] b/[refs]
index a2bc351e6c73..1f1d236524c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7407251a0e2ed099e4b12b742b635503e981507c
+refs/heads/master: 2384f55f8aa520172c995965bd2f8a9740d53095
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index fc02dadc604a..6d9521636aaa 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -1417,19 +1417,16 @@ static void zap_threads (struct mm_struct *mm)
 static void coredump_wait(struct mm_struct *mm)
 {
 	DECLARE_COMPLETION(startup_done);
+	int core_waiters;
 
-	mm->core_waiters++; /* let other threads block */
 	mm->core_startup_done = &startup_done;
 
-	/* give other threads a chance to run: */
-	yield();
-
 	zap_threads(mm);
-	if (--mm->core_waiters) {
-		up_write(&mm->mmap_sem);
+	core_waiters = mm->core_waiters;
+	up_write(&mm->mmap_sem);
+
+	if (core_waiters)
 		wait_for_completion(&startup_done);
-	} else
-		up_write(&mm->mmap_sem);
 	BUG_ON(mm->core_waiters);
 }