---

yaml --- r: 127609 b: refs/heads/master c: f5813d9 h: refs/heads/master i: 127607: 48e20e4 v: v3
git-mirror · Jan 8, 2009 · 586a995 · 586a995
1 parent 283df1f
commit 586a995
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13337714f3b0307dc7f75ef5d83ecf0db2abbd65
+refs/heads/master: f5813d94279a18ff5936d675e24b44b44a571197
diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c
@@ -1338,10 +1338,14 @@ static void cpuset_attach(struct cgroup_subsys *ss,
 	struct cpuset *oldcs = cgroup_cs(oldcont);
 	int err;
 
-	mutex_lock(&callback_mutex);
-	guarantee_online_cpus(cs, &cpus);
+	if (cs == &top_cpuset) {
+		cpus = cpu_possible_map;
+	} else {
+		mutex_lock(&callback_mutex);
+		guarantee_online_cpus(cs, &cpus);
+		mutex_unlock(&callback_mutex);
+	}
 	err = set_cpus_allowed_ptr(tsk, &cpus);
-	mutex_unlock(&callback_mutex);
 	if (err)
 		return;