From 64c4ba028eaa246ae153a259e73c5a18b3dc2601 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Fri, 4 Jul 2008 12:24:13 -0700
Subject: [PATCH] --- yaml --- r: 98727 b: refs/heads/master c:
 d79df630f622806c4d0e116fbaf6ebf6baf53461 h: refs/heads/master i:   98725:
 62909c6f22ebd56ab61744a7c3a96f465a400d55   98723:
 3ee4ce6998032425481ca8b738049f382165a3ba   98719:
 343d816817530870934bf1104fa2d203a333754b v: v3

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

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) {