From 4f603adc68f8ebe58ecbad605d23a7e3da3ad9c9 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Fri, 25 Jul 2008 01:47:23 -0700
Subject: [PATCH] --- yaml --- r: 105915 b: refs/heads/master c:
 489a5393a20dcbf91104052120eb2eff8791b61b h: refs/heads/master i:   105913:
 ad8458c21ec03f85d52bc9f3e8cf65ba9e76c001   105911:
 84594ab7ab1c6b6a18a01b881959cd02f7d1ec04 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/cpuset.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 99cb04db96f0..b885bb27ce40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c372e817afc629fea9ff6321313325ed0b4a855b
+refs/heads/master: 489a5393a20dcbf91104052120eb2eff8791b61b
diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c
index 60d2c4702c6c..531b235e546f 100644
--- a/trunk/kernel/cpuset.c
+++ b/trunk/kernel/cpuset.c
@@ -610,8 +610,13 @@ void rebuild_sched_domains(void)
 	while (__kfifo_get(q, (void *)&cp, sizeof(cp))) {
 		struct cgroup *cont;
 		struct cpuset *child;   /* scans child cpusets of cp */
+
+		if (cpus_empty(cp->cpus_allowed))
+			continue;
+
 		if (is_sched_load_balance(cp))
 			csa[csn++] = cp;
+
 		list_for_each_entry(cont, &cp->css.cgroup->children, sibling) {
 			child = cgroup_cs(cont);
 			__kfifo_put(q, (void *)&child, sizeof(cp));