diff --git a/[refs] b/[refs]
index 1287e0e174ea..742063da3d85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6e238dceed36891cc633167afe7151f1f3d83c5
+refs/heads/master: 701085b219016d38f105b031381b9cee6200253a
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index 1e94d2263ae0..95551c6da090 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -850,6 +850,7 @@ static int exec_mmap(struct mm_struct *mm)
 	if (old_mm) {
 		up_read(&old_mm->mmap_sem);
 		BUG_ON(active_mm != old_mm);
+		setmax_mm_hiwater_rss(&tsk->signal->maxrss, old_mm);
 		mm_update_next_owner(old_mm);
 		mmput(old_mm);
 		return 0;
@@ -980,9 +981,6 @@ static int de_thread(struct task_struct *tsk)
 	/* we have changed execution domain */
 	tsk->exit_signal = SIGCHLD;
 
-	if (current->mm)
-		setmax_mm_hiwater_rss(&sig->maxrss, current->mm);
-
 	exit_itimers(sig);
 	flush_itimer_signals();