diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
| commit | 1471f525455788c20b130690e0f104df451aeb43 (patch) | |
| tree | 3778beba56558beb9a9548ea5b467e9c44ea966f /arch/i386/kernel/process.c | |
| parent | e80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff) | |
Merge with Linux 2.3.51.
Diffstat (limited to 'arch/i386/kernel/process.c')
| -rw-r--r-- | arch/i386/kernel/process.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c index a043b4cfe..3ba1d8257 100644 --- a/arch/i386/kernel/process.c +++ b/arch/i386/kernel/process.c @@ -75,11 +75,11 @@ void enable_hlt(void) static void default_idle(void) { if (current_cpu_data.hlt_works_ok && !hlt_counter) { - asm volatile("cli" : : : "memory"); + __cli(); if (!current->need_resched) - asm volatile("sti ; hlt" : : : "memory"); + safe_halt(); else - asm volatile("sti" : : : "memory"); + __sti(); } } |