1 files changed, 11 insertions, 1 deletions

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 3a45b7dd0a09..ccbdb22147bb 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -526,8 +526,18 @@ long do_get_mempolicy(int *policy, nodemask_t *nmask,
         struct mempolicy *pol = current->mempolicy;
 
         cpuset_update_task_memory_state();
-        if (flags & ~(unsigned long)(MPOL_F_NODE|MPOL_F_ADDR))
+        if (flags &
+                ~(unsigned long)(MPOL_F_NODE|MPOL_F_ADDR|MPOL_F_MEMS_ALLOWED))
                 return -EINVAL;
+
+        if (flags & MPOL_F_MEMS_ALLOWED) {
+                if (flags & (MPOL_F_NODE|MPOL_F_ADDR))
+                        return -EINVAL;
+                *policy = 0;    /* just so it's initialized */
+                *nmask  = cpuset_current_mems_allowed;
+                return 0;
+        }
+
         if (flags & MPOL_F_ADDR) {
                 down_read(&mm->mmap_sem);
                 vma = find_vma_intersection(mm, addr, addr+1);