1 files changed, 12 insertions, 3 deletions

diff --git a/kernel/exit.c b/kernel/exit.c
index 63d82957baae..b66f0d55c791 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -664,6 +664,7 @@ assign_new_owner:
 static void exit_mm(struct task_struct * tsk)
 {
         struct mm_struct *mm = tsk->mm;
+        struct core_state *core_state;
 
         mm_release(tsk, mm);
         if (!mm)
@@ -676,11 +677,19 @@ static void exit_mm(struct task_struct * tsk)
          * group with ->mm != NULL.
          */
         down_read(&mm->mmap_sem);
-        if (mm->core_state) {
+        core_state = mm->core_state;
+        if (core_state) {
+                struct core_thread self;
                 up_read(&mm->mmap_sem);
 
-                if (atomic_dec_and_test(&mm->core_state->nr_threads))
-                        complete(&mm->core_state->startup);
+                self.task = tsk;
+                self.next = xchg(&core_state->dumper.next, &self);
+                /*
+                 * Implies mb(), the result of xchg() must be visible
+                 * to core_state->dumper.
+                 */
+                if (atomic_dec_and_test(&core_state->nr_threads))
+                        complete(&core_state->startup);
 
                 wait_for_completion(&mm->core_done);
                 down_read(&mm->mmap_sem);