---

yaml --- r: 198224 b: refs/heads/master c: e17f74a h: refs/heads/master v: v3
git-mirror · May 25, 2010 · bbb0a90 · bbb0a90
1 parent a6ae2c7
commit bbb0a90
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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 */