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 <[email protected]> --- arch/x86_64/kernel/reboot.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) dbc7607f71b4c6e38b141340f7afd33248a4205a diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c --- a/arch/x86_64/kernel/reboot.c +++ b/arch/x86_64/kernel/reboot.c @@ -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(); } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- [PATCH 22/23] acpi_power_off: Don't switch to the boot cpu
- From: [email protected] (Eric W. Biederman)
- [PATCH 22/23] acpi_power_off: Don't switch to the boot cpu
- References:
- [PATCH 0/23] reboot-fixes
- From: [email protected] (Eric W. Biederman)
- [PATCH 1/23] Add missing device_suspsend(PMSG_FREEZE) calls.
- From: [email protected] (Eric W. Biederman)
- [PATCH 2/23] Refactor sys_reboot into reusable parts
- From: [email protected] (Eric W. Biederman)
- [PATCH 3/23] Make ctrl_alt_del call kernel_restart to get a proper reboot.
- From: [email protected] (Eric W. Biederman)
- [PATCH 4/23] Add emergency_restart()
- From: [email protected] (Eric W. Biederman)
- [PATCH 5/23] Fix the arguments to machine_restart on cris
- From: [email protected] (Eric W. Biederman)
- [PATCH 6/23] Don't export machine_restart, machine_halt, or machine_power_off.
- From: [email protected] (Eric W. Biederman)
- [PATCH 7/23] i386: Implement machine_emergency_reboot
- From: [email protected] (Eric W. Biederman)
- [PATCH 8/23] x86_64: Fix reboot_force
- From: [email protected] (Eric W. Biederman)
- [PATCH 9/23] x86_64: Implemenent machine_emergency_restart
- From: [email protected] (Eric W. Biederman)
- [PATCH 10/23] Use kernel_power_off in sysrq-o
- From: [email protected] (Eric W. Biederman)
- [PATCH 11/23] Call emergency_reboot from panic
- From: [email protected] (Eric W. Biederman)
- [PATCH 12/23] Update sysrq-B to use emergency_restart()
- From: [email protected] (Eric W. Biederman)
- [PATCH 13/23] Fix watchdog drivers to call emergency_reboot()
- From: [email protected] (Eric W. Biederman)
- [PATCH 14/23] In hangcheck-timer.c call emergency_restart()
- From: [email protected] (Eric W. Biederman)
- [PATCH 15/23] 68328serial: sysrq should use emergency_reboot
- From: [email protected] (Eric W. Biederman)
- [PATCH 16/23] swpsuspend: Have suspend to disk use factors of sys_reboot
- From: [email protected] (Eric W. Biederman)
- [PATCH 17/23] pcwd.c: Call kernel_power_off not machine_power_off
- From: [email protected] (Eric W. Biederman)
- [PATCH 18/23] machine_shutdown: Typo fix to actually allow specifying which cpu to reboot on
- From: [email protected] (Eric W. Biederman)
- [PATCH 19/23] i386 machine_power_off cleanup
- From: [email protected] (Eric W. Biederman)
- [PATCH 20/23] APM: Remove redundant call to set_cpus_allowed
- From: [email protected] (Eric W. Biederman)
- [PATCH 0/23] reboot-fixes
- Prev by Date: [PATCH 23/23] acpi: Don't call acpi_sleep_prepare from acpi_power_off
- Next by Date: 2.4.31 panics on boot on 486 box: TSC requires pentium
- Previous by thread: [PATCH 20/23] APM: Remove redundant call to set_cpus_allowed
- Next by thread: [PATCH 22/23] acpi_power_off: Don't switch to the boot cpu
- Index(es):
