diff --git a/[refs] b/[refs]
index 1072ca1bcbe0..729c5d717603 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8a0b6ccf2ba2519ace65d782b41ee91bf3c3778
+refs/heads/master: d79df630f622806c4d0e116fbaf6ebf6baf53461
diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c
index a37a5034f63d..c94e58b192c3 100644
--- a/trunk/mm/mempolicy.c
+++ b/trunk/mm/mempolicy.c
@@ -729,7 +729,11 @@ static long do_get_mempolicy(int *policy, nodemask_t *nmask,
 	} else {
 		*policy = pol == &default_policy ? MPOL_DEFAULT :
 						pol->mode;
-		*policy |= pol->flags;
+		/*
+		 * Internal mempolicy flags must be masked off before exposing
+		 * the policy to userspace.
+		 */
+		*policy |= (pol->flags & MPOL_MODE_FLAGS);
 	}
 
 	if (vma) {