1 files changed, 5 insertions, 13 deletions

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index a220b13cbfaf..c9923e3c9a3b 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -1958,22 +1958,14 @@ nodemask_t cpuset_mems_allowed(struct task_struct *tsk)
 }
 
 /**
- * cpuset_zonelist_valid_mems_allowed - check zonelist vs. curremt mems_allowed
- * @zl: the zonelist to be checked
+ * cpuset_nodemask_valid_mems_allowed - check nodemask vs. curremt mems_allowed
+ * @nodemask: the nodemask to be checked
  *
- * Are any of the nodes on zonelist zl allowed in current->mems_allowed?
+ * Are any of the nodes in the nodemask allowed in current->mems_allowed?
  */
-int cpuset_zonelist_valid_mems_allowed(struct zonelist *zl)
+int cpuset_nodemask_valid_mems_allowed(nodemask_t *nodemask)
 {
-        int i;
-
-        for (i = 0; zl->_zonerefs[i].zone; i++) {
-                int nid = zonelist_node_idx(&zl->_zonerefs[i]);
-
-                if (node_isset(nid, current->mems_allowed))
-                        return 1;
-        }
-        return 0;
+        return nodes_intersects(*nodemask, current->mems_allowed);
 }
 
 /*