diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2005-07-26 11:44:21 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 14:35:42 -0700 |
| commit | 7c9a90073c75bffbb89763a0c7d44a2e44e9e628 (patch) | |
| tree | e871063796c481475926d63a4087f099a1a605db /arch/x86_64 | |
| parent | 4a1421f81b64e49ce932125e7222a2d7b7f87f13 (diff) | |
| download | kernel_samsung_tuna-7c9a90073c75bffbb89763a0c7d44a2e44e9e628.zip kernel_samsung_tuna-7c9a90073c75bffbb89763a0c7d44a2e44e9e628.tar.gz kernel_samsung_tuna-7c9a90073c75bffbb89763a0c7d44a2e44e9e628.tar.bz2 | |
[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>
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/kernel/reboot.c | 9 |
1 files changed, 1 insertions, 8 deletions
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 */ |