Merge tag 'v4.4.214' into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / mm / mempolicy.c

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 7716793..5165bfa 100644 (file)
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -2700,6 +2700,9 @@ int mpol_parse_str(char *str, struct mempolicy **mpol)
        char *flags = strchr(str, '=');
        int err = 1;
 
+       if (flags)
+               *flags++ = '\0';        /* terminate mode string */
+
        if (nodelist) {
                /* NUL-terminate mode or flags string */
                *nodelist++ = '\0';
@@ -2710,9 +2713,6 @@ int mpol_parse_str(char *str, struct mempolicy **mpol)
        } else
                nodes_clear(nodes);
 
-       if (flags)
-               *flags++ = '\0';        /* terminate mode string */
-
        for (mode = 0; mode < MPOL_MAX; mode++) {
                if (!strcmp(str, policy_modes[mode])) {
                        break;