From: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue, 26 Jul 2005 17:44:21 +0000 (-0600)
Subject: [PATCH] x86_64: Fix reboot_force
X-Git-Tag: v2.6.13-rc4~56
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=7c9a90073c75bffbb89763a0c7d44a2e44e9e628;p=safe%2Fjmp%2Flinux-2.6

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

diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
index 0515d32..d4c45ff 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 */