tree e871063796c481475926d63a4087f099a1a605db
parent 4a1421f81b64e49ce932125e7222a2d7b7f87f13
author Eric W. Biederman <[EMAIL PROTECTED]> Tue, 26 Jul 2005 23:44:21 -0600
committer Linus Torvalds <[EMAIL PROTECTED]> Wed, 27 Jul 2005 04:35:42 -0700
[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 <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
arch/x86_64/kernel/reboot.c | 9 +--------
1 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
--- 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 */
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
