---

yaml --- r: 45721 b: refs/heads/master c: 30150f8 h: refs/heads/master i: 45719: 1985782 v: v3
git-mirror · Jan 23, 2007 · af74ded · af74ded
1 parent 22facf4
commit af74ded
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79603a35009ff39562cd5634fa1cf513eb080f27
+refs/heads/master: 30150f8d7b76f25b1127a5079528b7a17307f995
diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c
@@ -884,6 +884,10 @@ asmlinkage long sys_mbind(unsigned long start, unsigned long len,
 	err = get_nodes(&nodes, nmask, maxnode);
 	if (err)
 		return err;
+#ifdef CONFIG_CPUSETS
+	/* Restrict the nodes to the allowed nodes in the cpuset */
+	nodes_and(nodes, nodes, current->mems_allowed);
+#endif
 	return do_mbind(start, len, mode, &nodes, flags);
 }