---

yaml --- r: 311116 b: refs/heads/master c: 4fe7efd h: refs/heads/master v: v3
git-mirror · Jun 20, 2012 · dc79afb · dc79afb
1 parent d8a4de9
commit dc79afb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0897d75f0b22e8c3a7287a48548c5686ef73447
+refs/heads/master: 4fe7efdbdfb1c7e7a7f31decfd831c0f31d37091
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
@@ -819,10 +819,10 @@ 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) {
+		sync_mm_rss(old_mm);
 		/*
 		 * Make sure that if there is a core dump in progress
 		 * for the old mm, we get out and die instead of going

diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
@@ -643,6 +643,7 @@ static void exit_mm(struct task_struct * tsk)
 	mm_release(tsk, mm);
 	if (!mm)
 		return;
+	sync_mm_rss(mm);
 	/*
 	 * Serialize with any possible pending coredump.
 	 * We must hold mmap_sem around checking core_state