From 3aa9c7ac607deac63df4da95caab79a2d90125c8 Mon Sep 17 00:00:00 2001 From: Paul Jackson Date: Fri, 20 May 2005 13:59:15 -0700 Subject: [PATCH] --- yaml --- r: 1295 b: refs/heads/master c: b39c4fab259b216148e705344a892c96efe1946d h: refs/heads/master i: 1293: 653292ca5f02efe0e5cfc85bb9936ad1537cff61 1291: a14773dd145f49effec44cc8f1d63cebe8f33375 1287: 0833747935a4ea32ae1db6977299d444f98fc5ae 1279: 584c48e405c5ff0c5e2e5af08587160514bd9a33 v: v3 --- [refs] | 2 +- trunk/Documentation/cpusets.txt | 3 +-- trunk/kernel/sched.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b382204c4798..a55a146c493f 100644 --- 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 index 1ad26d2c20ae..2f8f24eaefd9 100644 --- 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 index 0dc3158667a2..66b2ed784822 100644 --- 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); /*