From 890a2fb139d9d98efde454f69fe34b9b25255f60 Mon Sep 17 00:00:00 2001
From: Paul Jackson <pj@sgi.com>
Date: Fri, 31 Mar 2006 02:30:51 -0800
Subject: [PATCH] --- yaml --- r: 24893 b: refs/heads/master c:
 2741a559a01e1ba9bf87285569dc1a104d134ecf h: refs/heads/master i:   24891:
 323c10cccd2b86b147d0395aa2396531df4fc4a0 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/cpuset.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 496b2dca1ab5..7cebcc8a0572 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a01c8d5be628ac20cfd432c21808d76be5813e6
+refs/heads/master: 2741a559a01e1ba9bf87285569dc1a104d134ecf
diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c
index 2523a4b6a8c6..bf42381a4195 100644
--- a/trunk/kernel/cpuset.c
+++ b/trunk/kernel/cpuset.c
@@ -1183,11 +1183,11 @@ static int attach_task(struct cpuset *cs, char *pidbuf, char **ppathbuf)
 	mm = get_task_mm(tsk);
 	if (mm) {
 		mpol_rebind_mm(mm, &to);
+		if (is_memory_migrate(cs))
+			do_migrate_pages(mm, &from, &to, MPOL_MF_MOVE_ALL);
 		mmput(mm);
 	}
 
-	if (is_memory_migrate(cs))
-		do_migrate_pages(tsk->mm, &from, &to, MPOL_MF_MOVE_ALL);
 	put_task_struct(tsk);
 	synchronize_rcu();
 	if (atomic_dec_and_test(&oldcs->count))