diff options
author | Zachary Amsden <zach@vmware.com> | 2005-09-03 15:56:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 00:06:12 -0700 |
commit | f2ab4461249df85b20930a7a57b54f39c5ae291a (patch) | |
tree | 17fbe46fdc6e95bf24faccb6001d89c989442f6f /arch/i386/mach-voyager | |
parent | 4f0cb8d978ab4b6e3b40147f619f48316d9d7f63 (diff) | |
download | kernel_samsung_tuna-f2ab4461249df85b20930a7a57b54f39c5ae291a.zip kernel_samsung_tuna-f2ab4461249df85b20930a7a57b54f39c5ae291a.tar.gz kernel_samsung_tuna-f2ab4461249df85b20930a7a57b54f39c5ae291a.tar.bz2 |
[PATCH] x86: more asm cleanups
Some more assembler cleanups I noticed along the way.
Signed-off-by: Zachary Amsden <zach@vmware.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/mach-voyager')
-rw-r--r-- | arch/i386/mach-voyager/voyager_basic.c | 14 | ||||
-rw-r--r-- | arch/i386/mach-voyager/voyager_smp.c | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/i386/mach-voyager/voyager_basic.c index c638406..cc69875 100644 --- a/arch/i386/mach-voyager/voyager_basic.c +++ b/arch/i386/mach-voyager/voyager_basic.c @@ -234,10 +234,9 @@ voyager_power_off(void) #endif } /* and wait for it to happen */ - for(;;) { - __asm("cli"); - __asm("hlt"); - } + local_irq_disable(); + for(;;) + halt(); } /* copied from process.c */ @@ -278,10 +277,9 @@ machine_restart(char *cmd) outb(basebd | 0x08, VOYAGER_MC_SETUP); outb(0x02, catbase + 0x21); } - for(;;) { - asm("cli"); - asm("hlt"); - } + local_irq_disable(); + for(;;) + halt(); } void diff --git a/arch/i386/mach-voyager/voyager_smp.c b/arch/i386/mach-voyager/voyager_smp.c index 0e1f420..16790b7 100644 --- a/arch/i386/mach-voyager/voyager_smp.c +++ b/arch/i386/mach-voyager/voyager_smp.c @@ -1015,7 +1015,7 @@ smp_stop_cpu_function(void *dummy) cpu_clear(smp_processor_id(), cpu_online_map); local_irq_disable(); for(;;) - __asm__("hlt"); + halt(); } static DEFINE_SPINLOCK(call_lock); |