Commit 0963aba5 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds

[PATCH] x86_64 sync machine_power_off with i386

i386 machine_power_off was disabling the local apic
and all of it's users wanted to be on the boot cpu.
So call machine_shutdown which places us on the boot
cpu and disables the apics.  This keeps us in sync
and reduces the number of cases we need to worry about in
the power management code.
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 910de55c
...@@ -153,6 +153,9 @@ void machine_halt(void) ...@@ -153,6 +153,9 @@ void machine_halt(void)
void machine_power_off(void) void machine_power_off(void)
{ {
if (!reboot_force) {
machine_shutdown();
}
if (pm_power_off) if (pm_power_off)
pm_power_off(); pm_power_off();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment