Messages in this thread Patch in this message | | | Subject | [PATCH 19/23] i386 machine_power_off cleanup | From | (Eric W. Biederman) | Date | Tue, 26 Jul 2005 12:08:53 -0600 |
| |
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 <ebiederm@xmission.com> ---
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 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/
| |