Skip to content

Commit

Permalink
[PATCH] x86_64 sync machine_power_off with i386
Browse files Browse the repository at this point in the history
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: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Eric W. Biederman authored and Linus Torvalds committed Jul 26, 2005
1 parent 910de55 commit 0963aba
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/x86_64/kernel/reboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ void machine_halt(void)

void machine_power_off(void)
{
if (!reboot_force) {
machine_shutdown();
}
if (pm_power_off)
pm_power_off();
}
Expand Down

0 comments on commit 0963aba

Please sign in to comment.