From 6890b3ec662e339b6fbd0d4bffcb72bcc12a7bcb Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Tue, 23 Mar 2010 13:35:37 -0700
Subject: [PATCH] --- yaml --- r: 188920 b: refs/heads/master c:
 298359c5bf06c04258d7cf552426e198c47e83c1 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/mm/memory.c      | 1 +
 trunk/mm/mmu_context.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 974f3a7e0e9d..e7954b702fd8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53feb29767c29c877f9d47dcfe14211b5b0f7ebd
+refs/heads/master: 298359c5bf06c04258d7cf552426e198c47e83c1
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 5b7f2002e54b..bc9ba5a1f5b9 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -130,6 +130,7 @@ void __sync_task_rss_stat(struct task_struct *task, struct mm_struct *mm)
 
 	for (i = 0; i < NR_MM_COUNTERS; i++) {
 		if (task->rss_stat.count[i]) {
+			BUG_ON(!mm);
 			add_mm_counter(mm, i, task->rss_stat.count[i]);
 			task->rss_stat.count[i] = 0;
 		}
diff --git a/trunk/mm/mmu_context.c b/trunk/mm/mmu_context.c
index 0777654147c9..9e82e937000e 100644
--- a/trunk/mm/mmu_context.c
+++ b/trunk/mm/mmu_context.c
@@ -53,6 +53,7 @@ void unuse_mm(struct mm_struct *mm)
 	struct task_struct *tsk = current;
 
 	task_lock(tsk);
+	sync_mm_rss(tsk, mm);
 	tsk->mm = NULL;
 	/* active_mm is still 'mm' */
 	enter_lazy_tlb(mm, tsk);