[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 <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
d8e392e7c8
commit
4fa2564a6f
|
@ -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();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue