[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>

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 c6384061328a..cc69875d979b 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 0e1f4208b07c..16790b798613 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);