diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 21:40:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 21:40:25 -0400 |
| commit | 462cee296476278acaa54c41925b3273e0e4dd40 (patch) | |
| tree | c9d9fcfc4dd62807cb67678a6eda0151bfa8be95 /kernel/sched.c | |
| parent | 126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c (diff) | |
| parent | 4ec5240ec367a592834385893200dd4fb369354c (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 | /* |