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 /include/asm-i386/bugs.h | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'include/asm-i386/bugs.h')
| -rw-r--r-- | include/asm-i386/bugs.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-i386/bugs.h b/include/asm-i386/bugs.h index 6789fc275da3..ea54540638d2 100644 --- a/include/asm-i386/bugs.h +++ b/include/asm-i386/bugs.h | |||
| @@ -118,7 +118,10 @@ static void __init check_hlt(void) | |||
| 118 | printk("disabled\n"); | 118 | printk("disabled\n"); |
| 119 | return; | 119 | return; |
| 120 | } | 120 | } |
| 121 | __asm__ __volatile__("hlt ; hlt ; hlt ; hlt"); | 121 | halt(); |
| 122 | halt(); | ||
| 123 | halt(); | ||
| 124 | halt(); | ||
| 122 | printk("OK.\n"); | 125 | printk("OK.\n"); |
| 123 | } | 126 | } |
| 124 | 127 | ||