diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
| commit | a2e30e529a48ef4e106e405f91cf4ae525bb01c4 (patch) | |
| tree | 2def96ef17c0672c30f1a10287552978bf1d0b1c /kernel/power/smp.c | |
| parent | edb3366703224d5d8df573ae698ccd6b488dc743 (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge /spare/repo/linux-2.6/
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 | } |