From c0545f9fca6703d28d2239e2b9bf3b7e61899361 Mon Sep 17 00:00:00 2001 From: Konstantin Khlebnikov Date: Thu, 31 May 2012 16:26:21 -0700 Subject: [PATCH] --- yaml --- r: 309744 b: refs/heads/master c: f7505d64f2db5da2d7d94873ddf2cd2524847061 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/fork.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 523d960f54e0..5e3f78c8e9e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bca15543736f9be6d84e0bbc262ea7069076b9e6 +refs/heads/master: f7505d64f2db5da2d7d94873ddf2cd2524847061 diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index 017fb23d5983..2254fbf23567 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -787,9 +787,6 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm) /* Get rid of any cached register state */ deactivate_mm(tsk, mm); - if (tsk->vfork_done) - complete_vfork_done(tsk); - /* * If we're exiting normally, clear a user-space tid field if * requested. We leave this alone when dying by signal, to leave @@ -810,6 +807,13 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm) } tsk->clear_child_tid = NULL; } + + /* + * All done, finally we can wake up parent and return this mm to him. + * Also kthread_stop() uses this completion for synchronization. + */ + if (tsk->vfork_done) + complete_vfork_done(tsk); } /*