[PATCH] x86_64: Fix reboot_force
authorEric W. Biederman <ebiederm@xmission.com>
Tue, 26 Jul 2005 17:44:21 +0000 (11:44 -0600)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Jul 2005 21:35:42 +0000 (14:35 -0700)
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>
arch/x86_64/kernel/reboot.c

index 0515d32666342dcd9acb7fedbb3dc5eef265caa0..d4c45ff92d5c6688aad158f78013ab0df9f944e3 100644 (file)
@@ -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 */