---

yaml --- r: 1295 b: refs/heads/master c: b39c4fa h: refs/heads/master i: 1293: 653292c 1291: a14773d 1287: 0833747 1279: 584c48e v: v3
git-mirror · May 20, 2005 · 3aa9c7a · 3aa9c7a
1 parent 32b27db
commit 3aa9c7a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2665f92ae67a2d086537979d317a6f3a5697c63
+refs/heads/master: b39c4fab259b216148e705344a892c96efe1946d
diff --git a/trunk/Documentation/cpusets.txt b/trunk/Documentation/cpusets.txt
@@ -252,8 +252,7 @@ in a tasks processor placement.
 There is an exception to the above.  If hotplug funtionality is used
 to remove all the CPUs that are currently assigned to a cpuset,
 then the kernel will automatically update the cpus_allowed of all
-tasks attached to CPUs in that cpuset with the online CPUs of the
-nearest parent cpuset that still has some CPUs online.  When memory
+tasks attached to CPUs in that cpuset to allow all CPUs.  When memory
 hotplug functionality for removing Memory Nodes is available, a
 similar exception is expected to apply there as well.  In general,
 the kernel prefers to violate cpuset placement, over starving a task

diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -4243,7 +4243,7 @@ static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *tsk)
 
 	/* No more Mr. Nice Guy. */
 	if (dest_cpu == NR_CPUS) {
-		tsk->cpus_allowed = cpuset_cpus_allowed(tsk);
+		cpus_setall(tsk->cpus_allowed);
 		dest_cpu = any_online_cpu(tsk->cpus_allowed);
 
 		/*