3 files changed, 6 insertions, 16 deletions

diff --git a/fs/exec.c b/fs/exec.c
index b926ed19301e..a79786a8d2c8 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -819,6 +819,7 @@ static int exec_mmap(struct mm_struct *mm)
         /* Notify parent that we're no longer interested in the old VM */
         tsk = current;
         old_mm = current->mm;
+        sync_mm_rss(old_mm);
         mm_release(tsk, old_mm);
 
         if (old_mm) {
diff --git a/kernel/exit.c b/kernel/exit.c
index 804fb6bb8161..34867cc5b42a 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -423,7 +423,6 @@ void daemonize(const char *name, ...)
          * user space pages.  We don't need them, and if we didn't close them
          * they would be locked into memory.
          */
-        mm_release(current, current->mm);
         exit_mm(current);
         /*
          * We don't want to get frozen, in case system-wide hibernation
@@ -641,6 +640,7 @@ 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)
                 return;
         /*
@@ -960,13 +960,9 @@ void do_exit(long code)
                                 preempt_count());
 
         acct_update_integrals(tsk);
-
-        /* Set exit_code before complete_vfork_done() in mm_release() */
-        tsk->exit_code = code;
-
-        /* Release mm and sync mm's RSS info before statistics gathering */
-        mm_release(tsk, tsk->mm);
-
+        /* sync mm's RSS info before statistics gathering */
+        if (tsk->mm)
+                sync_mm_rss(tsk->mm);
         group_dead = atomic_dec_and_test(&tsk->signal->live);
         if (group_dead) {
                 hrtimer_cancel(&tsk->signal->real_timer);
@@ -979,6 +975,7 @@ void do_exit(long code)
                 tty_audit_exit();
         audit_free(tsk);
 
+        tsk->exit_code = code;
         taskstats_exit(tsk, group_dead);
 
         exit_mm(tsk);
diff --git a/kernel/fork.c b/kernel/fork.c
index 0560781c6904..ab5211b9e622 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -619,14 +619,6 @@ void mmput(struct mm_struct *mm)
                         module_put(mm->binfmt->module);
                 mmdrop(mm);
         }
-
-        /*
-         * Final rss-counter synchronization. After this point there must be
-         * no pagefaults into this mm from the current context.  Otherwise
-         * mm->rss_stat will be inconsistent.
-         */
-        if (mm)
-                sync_mm_rss(mm);
 }
 EXPORT_SYMBOL_GPL(mmput);