From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 8 Dec 2011 04:32:04 +0000 (+1100)
Subject: cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix
X-Git-Tag: next-20111213~1^2~222
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9cbd53ff79fe0e3095dbd3ef734048c1a3db8e98;p=karo-tx-linux.git

cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix

stupid temporary hack to make it build with CONFIG_NUMA=n

Cc: David Rientjes <rientjes@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Miao Xie <miaox@cn.fujitsu.com>
Cc: Paul Menage <paul@paulmenage.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 52917e56a396..fb147b2caa09 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -968,7 +968,10 @@ repeat:
 	 * tsk does not have a mempolicy, then an empty nodemask will not be
 	 * possible when mems_allowed is larger than a word.
 	 */
-	need_loop = tsk->mempolicy ||
+	need_loop =
+#ifdef CONFIG_NUMA
+		tsk->mempolicy ||
+#endif
 			!nodes_intersects(*newmems, tsk->mems_allowed);
 	nodes_or(tsk->mems_allowed, tsk->mems_allowed, *newmems);
 	mpol_rebind_task(tsk, newmems, MPOL_REBIND_STEP1);