From e51acb03fb0344bb15092557a886ec8496b6430a Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Mon, 21 Sep 2009 17:03:52 -0700
Subject: [PATCH] --- yaml --- r: 164489 b: refs/heads/master c:
 f68e14805085972b4e0b0ab684af37f713b9c262 h: refs/heads/master i:   164487:
 e477bdb10682059f0d92edcbc3ab5d47cfb617a4 v: v3

---
 [refs]                 | 2 +-
 trunk/mm/mmu_context.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2c6bf934d301..cd2176b3c46e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d2d827f5ca5e32816194119d5c980c7e04474a6
+refs/heads/master: f68e14805085972b4e0b0ab684af37f713b9c262
diff --git a/trunk/mm/mmu_context.c b/trunk/mm/mmu_context.c
index fd473b51c903..ded9081f4021 100644
--- a/trunk/mm/mmu_context.c
+++ b/trunk/mm/mmu_context.c
@@ -26,13 +26,16 @@ void use_mm(struct mm_struct *mm)
 
 	task_lock(tsk);
 	active_mm = tsk->active_mm;
-	atomic_inc(&mm->mm_count);
+	if (active_mm != mm) {
+		atomic_inc(&mm->mm_count);
+		tsk->active_mm = mm;
+	}
 	tsk->mm = mm;
-	tsk->active_mm = mm;
 	switch_mm(active_mm, mm, tsk);
 	task_unlock(tsk);
 
-	mmdrop(active_mm);
+	if (active_mm != mm)
+		mmdrop(active_mm);
 }
 
 /*