From 6882456bdb497d8413f0c34cd4ca3f6e934537c3 Mon Sep 17 00:00:00 2001
From: Greg Thelen <gthelen@google.com>
Date: Fri, 25 Feb 2011 14:44:13 -0800
Subject: [PATCH] --- yaml --- r: 233690 b: refs/heads/master c:
 a879bf582dfb3a79d30d76ca3af2ae8a0f39010c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8df4a3f0055b..d1e2b5339cbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22bacca48a1755f79b7e0f192ddb9fbb7fc6e64e
+refs/heads/master: a879bf582dfb3a79d30d76ca3af2ae8a0f39010c
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
index 766115253807..352de555626c 100644
--- a/trunk/mm/migrate.c
+++ b/trunk/mm/migrate.c
@@ -1287,14 +1287,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
 		return -EPERM;
 
 	/* Find the mm_struct */
-	read_lock(&tasklist_lock);
+	rcu_read_lock();
 	task = pid ? find_task_by_vpid(pid) : current;
 	if (!task) {
-		read_unlock(&tasklist_lock);
+		rcu_read_unlock();
 		return -ESRCH;
 	}
 	mm = get_task_mm(task);
-	read_unlock(&tasklist_lock);
+	rcu_read_unlock();
 
 	if (!mm)
 		return -EINVAL;