From: Eric W. Biederman Date: Tue, 26 Jul 2005 18:08:53 +0000 (-0600) Subject: [PATCH] i386 machine_power_off cleanup X-Git-Tag: v2.6.13-rc4~45 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fa2564a6fde9815df969ef3547744a22f66ba9d;p=linux-2.6 [PATCH] i386 machine_power_off cleanup 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 Signed-off-by: Linus Torvalds --- diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c index 1049876702..c71fef31dc 100644 --- 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(); }