Register with kernel poweroff handler instead of setting pm_power_off directly. Register with high priority value of 192 to reflect that the driver explicitly overrides existing poweroff handlers.
Cc: Rafael J. Wysocki <r...@rjwysocki.net> Cc: Len Brown <l...@kernel.org> Signed-off-by: Guenter Roeck <li...@roeck-us.net> --- drivers/acpi/sleep.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 54da4a3..25aad22 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -15,6 +15,8 @@ #include <linux/dmi.h> #include <linux/device.h> #include <linux/suspend.h> +#include <linux/notifier.h> +#include <linux/pm.h> #include <linux/reboot.h> #include <linux/acpi.h> #include <linux/module.h> @@ -811,14 +813,22 @@ static void acpi_power_off_prepare(void) acpi_disable_all_gpes(); } -static void acpi_power_off(void) +static int acpi_power_off(struct notifier_block *this, + unsigned long unused1, void *unused2) { /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */ printk(KERN_DEBUG "%s called\n", __func__); local_irq_disable(); acpi_enter_sleep_state(ACPI_STATE_S5); + + return NOTIFY_DONE; } +static struct notifier_block acpi_poweroff_nb = { + .notifier_call = acpi_power_off, + .priority = 192, +}; + int __init acpi_sleep_init(void) { char supported[ACPI_S_STATE_COUNT * 3 + 1]; @@ -835,7 +845,8 @@ int __init acpi_sleep_init(void) if (acpi_sleep_state_supported(ACPI_STATE_S5)) { sleep_states[ACPI_STATE_S5] = 1; pm_power_off_prepare = acpi_power_off_prepare; - pm_power_off = acpi_power_off; + if (register_poweroff_handler(&acpi_poweroff_nb)) + pr_err("acpi: Failed to register poweroff handler\n"); } supported[0] = 0; -- 1.9.1 ------------------------------------------------------------------------------ Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel