diff --git a/[refs] b/[refs] index 1474eb37d26e..02bba25d5c7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c363afe94b885d39ae2e93e41680282a470ad84 +refs/heads/master: 413b43deab8377819aba1dbad2abf0c15d59b491 diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c index 643f66e10187..745ce90308a6 100644 --- a/trunk/mm/mempolicy.c +++ b/trunk/mm/mempolicy.c @@ -2215,10 +2215,15 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context) goto out; mode = MPOL_PREFERRED; break; - + case MPOL_DEFAULT: + /* + * Insist on a empty nodelist + */ + if (!nodelist) + err = 0; + goto out; /* * case MPOL_BIND: mpol_new() enforces non-empty nodemask. - * case MPOL_DEFAULT: mpol_new() enforces empty nodemask, ignores flags. */ }