machine_power_off now always switches to the boot cpu so there is no reason for APM to also do that. Signed-off-by: Eric W. Biederman <[email protected]> --- arch/i386/kernel/apm.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) 8e1e879e7ead62da7d2c2030eebbf8142547b619 diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c --- a/arch/i386/kernel/apm.c +++ b/arch/i386/kernel/apm.c @@ -911,14 +911,7 @@ static void apm_power_off(void) 0xcd, 0x15 /* int $0x15 */ }; - /* - * This may be called on an SMP machine. - */ -#ifdef CONFIG_SMP /* Some bioses don't like being called from CPU != 0 */ - set_cpus_allowed(current, cpumask_of_cpu(0)); - BUG_ON(smp_processor_id() != 0); -#endif if (apm_info.realmode_power_off) { (void)apm_save_cpus(); - 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 21/23] x86_64 sync machine_power_off with i386
- From: [email protected] (Eric W. Biederman)
- [PATCH 21/23] x86_64 sync machine_power_off with i386
- 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 0/23] reboot-fixes
- Prev by Date: Re: list patches in kernel
- Next by Date: Re: PCI: fix up errors after dma bursting patch and CONFIG_PCI=n -- bug?
- Previous by thread: [PATCH 19/23] i386 machine_power_off cleanup
- Next by thread: [PATCH 21/23] x86_64 sync machine_power_off with i386
- Index(es):
