[PATCH] x86_64: Fix reboot_force

We only want to shutdown the apics if reboot_force
is not specified.  Be we are doing this both
in machine_shutdown which is called unconditionally
and if (!reboot_force).  So simply call machine_shutdown
if (!reboot_force).  It looks like something
went weird with merging some of the kexec patches for
x86_64, and caused this.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 1 insertions, 8 deletions

diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
index 0515d3266634..d4c45ff92d5c 100644
--- a/arch/x86_64/kernel/reboot.c
+++ b/arch/x86_64/kernel/reboot.c
@@ -115,15 +115,8 @@ void machine_restart(char * __unused)
 
         printk("machine restart\n");
 
-        machine_shutdown();
-
         if (!reboot_force) {
-                local_irq_disable();
-#ifndef CONFIG_SMP
-                disable_local_APIC();
-#endif
-                disable_IO_APIC();
-                local_irq_enable();
+                machine_shutdown();
         }
         
         /* Tell the BIOS if we want cold or warm reboot */