diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /kernel/power/smp.c | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'kernel/power/smp.c')
| -rw-r--r-- | kernel/power/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/smp.c b/kernel/power/smp.c index bbe23079c62c..911fc62b8225 100644 --- a/kernel/power/smp.c +++ b/kernel/power/smp.c | |||
| @@ -38,7 +38,7 @@ void disable_nonboot_cpus(void) | |||
| 38 | } | 38 | } |
| 39 | printk("Error taking cpu %d down: %d\n", cpu, error); | 39 | printk("Error taking cpu %d down: %d\n", cpu, error); |
| 40 | } | 40 | } |
| 41 | BUG_ON(smp_processor_id() != 0); | 41 | BUG_ON(raw_smp_processor_id() != 0); |
| 42 | if (error) | 42 | if (error) |
| 43 | panic("cpus not sleeping"); | 43 | panic("cpus not sleeping"); |
| 44 | } | 44 | } |