Messages in this thread Patch in this message | | | Subject | [PATCH 8/23] x86_64: Fix reboot_force | From | (Eric W. Biederman) | Date | Tue, 26 Jul 2005 11:44:21 -0600 |
| |
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> ---
arch/x86_64/kernel/reboot.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-)
a044301f20f8e977206a79ade92c6b385f9e2703 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 linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |