diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 01:47:10 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 01:47:10 -0400 |
| commit | 949d33e70f2c3e93bfe5265a50e40175b1ab1ec1 (patch) | |
| tree | ca88fd8f8f81b167dc4685ed34e9636f267db60d /kernel/sched.c | |
| parent | b095518ef51c37658c58367bd19240b8a113f25c (diff) | |
| parent | bef9c558841604116704e10b3d9ff3dbf4939423 (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 0dc3158667a2..66b2ed784822 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -4243,7 +4243,7 @@ static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *tsk) | |||
| 4243 | 4243 | ||
| 4244 | /* No more Mr. Nice Guy. */ | 4244 | /* No more Mr. Nice Guy. */ |
| 4245 | if (dest_cpu == NR_CPUS) { | 4245 | if (dest_cpu == NR_CPUS) { |
| 4246 | tsk->cpus_allowed = cpuset_cpus_allowed(tsk); | 4246 | cpus_setall(tsk->cpus_allowed); |
| 4247 | dest_cpu = any_online_cpu(tsk->cpus_allowed); | 4247 | dest_cpu = any_online_cpu(tsk->cpus_allowed); |
| 4248 | 4248 | ||
| 4249 | /* | 4249 | /* |