From bbb0a904ff715c3cd3ccc7896d3b85aa6e7acc75 Mon Sep 17 00:00:00 2001
From: Lee Schermerhorn <lee.schermerhorn@hp.com>
Date: Mon, 24 May 2010 14:32:02 -0700
Subject: [PATCH] --- yaml --- r: 198224 b: refs/heads/master c:
 e17f74af351cce9a1bade7b33af179497fdf95cf h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e9d0ba44bc98..4fff3877f1b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1980050250fa052b1c24a19f9b3d82fae14d77f8
+refs/heads/master: e17f74af351cce9a1bade7b33af179497fdf95cf
diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c
index ac5aeafaec9a..0e1b293e4054 100644
--- a/trunk/mm/mempolicy.c
+++ b/trunk/mm/mempolicy.c
@@ -2239,7 +2239,10 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
 	if (IS_ERR(new))
 		goto out;
 
-	{
+	if (no_context) {
+		/* save for contextualization */
+		new->w.user_nodemask = nodes;
+	} else {
 		int ret;
 		NODEMASK_SCRATCH(scratch);
 		if (scratch) {
@@ -2255,10 +2258,6 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
 		}
 	}
 	err = 0;
-	if (no_context) {
-		/* save for contextualization */
-		new->w.user_nodemask = nodes;
-	}
 
 out:
 	/* Restore string for error message */