1 files changed, 6 insertions, 0 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index 3e9fda0ca470..9435f298dd75 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1128,6 +1128,12 @@ static int shmem_parse_mpol(char *value, unsigned short *policy,
         if (flags) {
                 if (!strcmp(flags, "static"))
                         *mode_flags |= MPOL_F_STATIC_NODES;
+                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;
         }
 out:
         /* Restore string for error message */