diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 21:50:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 21:50:57 -0400 |
| commit | a5324343955997d1439f26518ddac567cd5d134b (patch) | |
| tree | f43558389c41e3a0f076c4ee55d77c4aa1561779 /kernel/power/smp.c | |
| parent | 8199d3a79c224bbe5943fa08684e1f93a17881b0 (diff) | |
| parent | a4936044001694f033fe4ea94d6034d51a6b465c (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'kernel/power/smp.c')
| -rw-r--r-- | kernel/power/smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/smp.c b/kernel/power/smp.c index cba3584b80fe..457c2302ed42 100644 --- a/kernel/power/smp.c +++ b/kernel/power/smp.c | |||
| @@ -48,11 +48,11 @@ void disable_nonboot_cpus(void) | |||
| 48 | { | 48 | { |
| 49 | oldmask = current->cpus_allowed; | 49 | oldmask = current->cpus_allowed; |
| 50 | set_cpus_allowed(current, cpumask_of_cpu(0)); | 50 | set_cpus_allowed(current, cpumask_of_cpu(0)); |
| 51 | printk("Freezing CPUs (at %d)", _smp_processor_id()); | 51 | printk("Freezing CPUs (at %d)", raw_smp_processor_id()); |
| 52 | current->state = TASK_INTERRUPTIBLE; | 52 | current->state = TASK_INTERRUPTIBLE; |
| 53 | schedule_timeout(HZ); | 53 | schedule_timeout(HZ); |
| 54 | printk("..."); | 54 | printk("..."); |
| 55 | BUG_ON(_smp_processor_id() != 0); | 55 | BUG_ON(raw_smp_processor_id() != 0); |
| 56 | 56 | ||
| 57 | /* FIXME: for this to work, all the CPUs must be running | 57 | /* FIXME: for this to work, all the CPUs must be running |
| 58 | * "idle" thread (or we deadlock). Is that guaranteed? */ | 58 | * "idle" thread (or we deadlock). Is that guaranteed? */ |