From a02f2ce85e266fdb50208a79b6f0678591351f16 Mon Sep 17 00:00:00 2001
From: Sasha Levin <levinsasha928@gmail.com>
Date: Wed, 25 Apr 2012 16:01:53 -0700
Subject: [PATCH] --- yaml --- r: 299663 b: refs/heads/master c:
 6e8b09eaf268bceac0c62e389b4bc0cb83dfb8e5 h: refs/heads/master i:   299661:
 8ad81a18b16b28276baf0d0582a47eb3ed007ff6   299659:
 f802f4b249ed0db0e492a19bf826528f5b858eb4   299655:
 fc875e120a445fa7a34550a2aba93a5d6723bf8e   299647:
 35865788199d833fd84e1182f8257c150f678a34 v: v3

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

diff --git a/[refs] b/[refs]
index 6782036743e4..eb921a717add 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2a9ef880763d7fbd657a3af646e132a90d70d34
+refs/heads/master: 6e8b09eaf268bceac0c62e389b4bc0cb83dfb8e5
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
index 51c08a0c6f68..11072383ae12 100644
--- a/trunk/mm/migrate.c
+++ b/trunk/mm/migrate.c
@@ -1388,14 +1388,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
 	mm = get_task_mm(task);
 	put_task_struct(task);
 
-	if (mm) {
-		if (nodes)
-			err = do_pages_move(mm, task_nodes, nr_pages, pages,
-					    nodes, status, flags);
-		else
-			err = do_pages_stat(mm, nr_pages, pages, status);
-	} else
-		err = -EINVAL;
+	if (!mm)
+		return -EINVAL;
+
+	if (nodes)
+		err = do_pages_move(mm, task_nodes, nr_pages, pages,
+				    nodes, status, flags);
+	else
+		err = do_pages_stat(mm, nr_pages, pages, status);
 
 	mmput(mm);
 	return err;