From af74ded2020eb18a893db3e5017c8da52f2566d6 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Mon, 22 Jan 2007 20:40:45 -0800
Subject: [PATCH] --- yaml --- r: 45721 b: refs/heads/master c:
 30150f8d7b76f25b1127a5079528b7a17307f995 h: refs/heads/master i:   45719:
 19857825eb53cfa6b9c48d9b1c7cf3e09325f7d7 v: v3

---
 [refs]               | 2 +-
 trunk/mm/mempolicy.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1ff165d979c1..b9a9a85b2172 100644
--- 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
index da9463946556..c2aec0e1090d 100644
--- 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);
 }