1 files changed, 4 insertions, 3 deletions

diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
index 47f95687905..75235ed2b31 100644
--- a/arch/x86_64/kernel/reboot.c
+++ b/arch/x86_64/kernel/reboot.c
@@ -77,6 +77,7 @@ static inline void kb_wait(void)
 
 void machine_shutdown(void)
 {
+        unsigned long flags;
         /* Stop the cpus and apics */
 #ifdef CONFIG_SMP
         int reboot_cpu_id;
@@ -98,7 +99,7 @@ void machine_shutdown(void)
         smp_send_stop();
 #endif
 
-        local_irq_disable();
+        local_irq_save(flags);
 
 #ifndef CONFIG_SMP
         disable_local_APIC();
@@ -106,7 +107,7 @@ void machine_shutdown(void)
 
         disable_IO_APIC();
 
-        local_irq_enable();
+        local_irq_restore(flags);
 }
 
 void machine_emergency_restart(void)
@@ -120,7 +121,7 @@ void machine_emergency_restart(void)
                 /* Could also try the reset bit in the Hammer NB */
                 switch (reboot_type) { 
                 case BOOT_KBD:
-                for (i=0; i<100; i++) {
+                for (i=0; i<10; i++) {
                         kb_wait();
                         udelay(50);
                         outb(0xfe,0x64);         /* pulse reset low */