diff --git a/[refs] b/[refs] index 02bba25d5c7a..02091bb4d6de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 413b43deab8377819aba1dbad2abf0c15d59b491 +refs/heads/master: d69b2e63e9172afb4d07c305601b79a55509ac4c diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c index 745ce90308a6..10db44f95749 100644 --- a/trunk/mm/mempolicy.c +++ b/trunk/mm/mempolicy.c @@ -2222,9 +2222,13 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context) if (!nodelist) err = 0; goto out; - /* - * case MPOL_BIND: mpol_new() enforces non-empty nodemask. - */ + case MPOL_BIND: + /* + * Insist on a nodelist + */ + if (!nodelist) + goto out; + err = 0; } mode_flags = 0;