---

yaml
---
r: 93999
b: refs/heads/master
c: a43361c
h: refs/heads/master
i:
  93997: 0b27195
  93995: 6fd9f87
  93991: 7b53617
  93983: 48247f1
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e1f064562fcff7bf3856bc1d00dfa84d4f121cc
+refs/heads/master: a43361cf3cb6fb6431fdbfb0f3ef26a334826160

trunk/mm/shmem.c

@@ -1125,20 +1125,26 @@ static int shmem_parse_mpol(char *value, unsigned short *policy,
 			*policy_nodes = node_states[N_HIGH_MEMORY];
 		err = 0;
 	}
+
+	*mode_flags = 0;
 	if (flags) {
+		/*
+		 * Currently, we only support two mutually exclusive
+		 * mode flags.
+		 */
 		if (!strcmp(flags, "static"))
 			*mode_flags |= MPOL_F_STATIC_NODES;
-		if (!strcmp(flags, "relative"))
+		else if (!strcmp(flags, "relative"))
 			*mode_flags |= MPOL_F_RELATIVE_NODES;
-
-		if ((*mode_flags & MPOL_F_STATIC_NODES) &&
-		    (*mode_flags & MPOL_F_RELATIVE_NODES))
-			err = 1;
+		else
+			err = 1;	/* unrecognized flag */
 	}
 out:
 	/* Restore string for error message */
 	if (nodelist)
 		*--nodelist = ':';
+	if (flags)
+		*--flags = '=';
 	return err;
 }