diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/i386/kernel/smp.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/i386/kernel/smp.c')
| -rw-r--r-- | arch/i386/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/smp.c b/arch/i386/kernel/smp.c index cec4bde67161..48b55db3680f 100644 --- a/arch/i386/kernel/smp.c +++ b/arch/i386/kernel/smp.c | |||
| @@ -576,7 +576,7 @@ static void stop_this_cpu (void * dummy) | |||
| 576 | local_irq_disable(); | 576 | local_irq_disable(); |
| 577 | disable_local_APIC(); | 577 | disable_local_APIC(); |
| 578 | if (cpu_data[smp_processor_id()].hlt_works_ok) | 578 | if (cpu_data[smp_processor_id()].hlt_works_ok) |
| 579 | for(;;) __asm__("hlt"); | 579 | for(;;) halt(); |
| 580 | for (;;); | 580 | for (;;); |
| 581 | } | 581 | } |
| 582 | 582 | ||