diff --git a/[refs] b/[refs]
index bddcaf89c39b..cbfe054c1e73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55ccf3fe3f9a3441731aa79cf42a628fc4ecace9
+refs/heads/master: 11aeca0b3a083a457f5c34fe8c677d5e86a0c6b3
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index b1fd2025e59a..8e2ddebaccdd 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -1930,8 +1930,21 @@ static int coredump_wait(int exit_code, struct core_state *core_state)
 		core_waiters = zap_threads(tsk, mm, core_state, exit_code);
 	up_write(&mm->mmap_sem);
 
-	if (core_waiters > 0)
+	if (core_waiters > 0) {
+		struct core_thread *ptr;
+
 		wait_for_completion(&core_state->startup);
+		/*
+		 * Wait for all the threads to become inactive, so that
+		 * all the thread context (extended register state, like
+		 * fpu etc) gets copied to the memory.
+		 */
+		ptr = core_state->dumper.next;
+		while (ptr != NULL) {
+			wait_task_inactive(ptr->task, 0);
+			ptr = ptr->next;
+		}
+	}
 
 	return core_waiters;
 }