Call machine_shutdown() to move to the boot cpu and disable apics. Both acpi_power_off and apm_power_off want to move to the boot cpu. and we are already disabling the local apics so calling machine_shutdown simply reuses code. ia64 doesn't have a special path in power_off for efi so there is no reason i386 should. If we really need to call the efi power off path the efi driver can set pm_power_off like everyone else. Signed-off-by: Eric W. Biederman <[email protected]> --- arch/i386/kernel/reboot.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) 9f163caa28f9d3392f0d8d3e5f131ea658a2a887 diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c --- a/arch/i386/kernel/reboot.c +++ b/arch/i386/kernel/reboot.c @@ -347,10 +347,8 @@ void machine_halt(void) void machine_power_off(void) { - lapic_shutdown(); + machine_shutdown(); - if (efi_enabled) - efi.reset_system(EFI_RESET_SHUTDOWN, EFI_SUCCESS, 0, NULL); if (pm_power_off) pm_power_off(); } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- [PATCH 20/23] APM: Remove redundant call to set_cpus_allowed
- From: [email protected] (Eric W. Biederman)
- [PATCH 20/23] APM: Remove redundant call to set_cpus_allowed
- References:
- [PATCH 0/23] reboot-fixes
- From: [email protected] (Eric W. Biederman)
- [PATCH 1/23] Add missing device_suspsend(PMSG_FREEZE) calls.
- From: [email protected] (Eric W. Biederman)
- [PATCH 2/23] Refactor sys_reboot into reusable parts
- From: [email protected] (Eric W. Biederman)
- [PATCH 3/23] Make ctrl_alt_del call kernel_restart to get a proper reboot.
- From: [email protected] (Eric W. Biederman)
- [PATCH 4/23] Add emergency_restart()
- From: [email protected] (Eric W. Biederman)
- [PATCH 5/23] Fix the arguments to machine_restart on cris
- From: [email protected] (Eric W. Biederman)
- [PATCH 6/23] Don't export machine_restart, machine_halt, or machine_power_off.
- From: [email protected] (Eric W. Biederman)
- [PATCH 7/23] i386: Implement machine_emergency_reboot
- From: [email protected] (Eric W. Biederman)
- [PATCH 8/23] x86_64: Fix reboot_force
- From: [email protected] (Eric W. Biederman)
- [PATCH 9/23] x86_64: Implemenent machine_emergency_restart
- From: [email protected] (Eric W. Biederman)
- [PATCH 10/23] Use kernel_power_off in sysrq-o
- From: [email protected] (Eric W. Biederman)
- [PATCH 11/23] Call emergency_reboot from panic
- From: [email protected] (Eric W. Biederman)
- [PATCH 12/23] Update sysrq-B to use emergency_restart()
- From: [email protected] (Eric W. Biederman)
- [PATCH 13/23] Fix watchdog drivers to call emergency_reboot()
- From: [email protected] (Eric W. Biederman)
- [PATCH 14/23] In hangcheck-timer.c call emergency_restart()
- From: [email protected] (Eric W. Biederman)
- [PATCH 15/23] 68328serial: sysrq should use emergency_reboot
- From: [email protected] (Eric W. Biederman)
- [PATCH 16/23] swpsuspend: Have suspend to disk use factors of sys_reboot
- From: [email protected] (Eric W. Biederman)
- [PATCH 17/23] pcwd.c: Call kernel_power_off not machine_power_off
- From: [email protected] (Eric W. Biederman)
- [PATCH 18/23] machine_shutdown: Typo fix to actually allow specifying which cpu to reboot on
- From: [email protected] (Eric W. Biederman)
- [PATCH 0/23] reboot-fixes
- Prev by Date: [PATCH 18/23] machine_shutdown: Typo fix to actually allow specifying which cpu to reboot on
- Next by Date: Re: list patches in kernel
- Previous by thread: [PATCH 18/23] machine_shutdown: Typo fix to actually allow specifying which cpu to reboot on
- Next by thread: [PATCH 20/23] APM: Remove redundant call to set_cpus_allowed
- Index(es):
