From: "Marcos D. Marado Torres" From: "Barry K. Nathan" On Tue, Feb 08, 2005 at 08:54:06PM -0800, Andrew Morton wrote: > "Marcos D. Marado Torres" wrote: > > > > Please add to -mm the patch in attachment, since it solves the old > > acpi_power_off bug... > > What acpi_power_off bug? And how does it solve it? Here's the observed bug that the patch is trying to fix: http://bugme.osdl.org/show_bug.cgi?id=4041 What Marcos posted is a typo-corrected version of Eric Biederman's patch: http://marc.theaimsgroup.com/?l=linux-kernel&m=110665542929525&w=2 In Eric's own words, the patch "needs some work before it goes into a mainline kernel". AFAICT it's more of a proof-of-concept, just to see if Eric's on the right track... This is the motivation behind the patch: http://marc.theaimsgroup.com/?l=linux-kernel&m=110665405402747&w=2 Signed-off-by: Andrew Morton --- 25-alpha-akpm/drivers/acpi/sleep/poweroff.c | 23 +++++++++++++++++++++-- 25-alpha-akpm/drivers/base/power/shutdown.c | 7 +++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff -puN drivers/acpi/sleep/poweroff.c~acpi_power_off-bug-fix drivers/acpi/sleep/poweroff.c --- 25-alpha/drivers/acpi/sleep/poweroff.c~acpi_power_off-bug-fix 2005-02-09 19:55:05.000000000 -0800 +++ 25-alpha-akpm/drivers/acpi/sleep/poweroff.c 2005-02-09 19:55:05.000000000 -0800 @@ -7,18 +7,37 @@ #include #include +#include #include #include #include "sleep.h" static void +acpi_power_off_prepare(void) +{ + if (system_state == SYSTEM_POWER_OFF) { + acpi_wakeup_gpe_poweroff_prepare(); + acpi_enter_sleep_state_prep(ACPI_STATE_S5); + } +} + +void +do_acpi_power_off_prepare(void) +{ + if (!acpi_disabled) { + acpi_power_off_prepare(); + } +} + + +static void acpi_power_off (void) { printk("%s called\n",__FUNCTION__); +#if 0 /* This should be made redundant by other patches.. */ /* Some SMP machines only can poweroff in boot CPU */ set_cpus_allowed(current, cpumask_of_cpu(0)); - acpi_wakeup_gpe_poweroff_prepare(); - acpi_enter_sleep_state_prep(ACPI_STATE_S5); +#endif ACPI_DISABLE_IRQS(); acpi_enter_sleep_state(ACPI_STATE_S5); } diff -puN drivers/base/power/shutdown.c~acpi_power_off-bug-fix drivers/base/power/shutdown.c --- 25-alpha/drivers/base/power/shutdown.c~acpi_power_off-bug-fix 2005-02-09 19:55:05.000000000 -0800 +++ 25-alpha-akpm/drivers/base/power/shutdown.c 2005-02-09 20:10:21.000000000 -0800 @@ -62,6 +62,13 @@ void device_shutdown(void) } up_write(&devices_subsys.rwsem); +#ifdef CONFIG_ACPI + { + extern void do_acpi_power_off_prepare(void); + do_acpi_power_off_prepare(); + } +#endif + sysdev_shutdown(); } _