From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bh-25.webhostbox.net (bh-25.webhostbox.net [208.91.199.152]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41F2B1A0986 for ; Tue, 7 Oct 2014 16:30:23 +1100 (EST) Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1XbNLp-002en4-8j for linuxppc-dev@lists.ozlabs.org; Tue, 07 Oct 2014 05:30:21 +0000 From: Guenter Roeck To: linux-kernel@vger.kernel.org Subject: [PATCH 27/44] x86: apm: Register with kernel poweroff handler Date: Mon, 6 Oct 2014 22:28:29 -0700 Message-Id: <1412659726-29957-28-git-send-email-linux@roeck-us.net> In-Reply-To: <1412659726-29957-1-git-send-email-linux@roeck-us.net> References: <1412659726-29957-1-git-send-email-linux@roeck-us.net> Cc: linux-m32r-ja@ml.linux-m32r.org, linux-mips@linux-mips.org, linux-efi@vger.kernel.org, linux-ia64@vger.kernel.org, linux-xtensa@linux-xtensa.org, "H. Peter Anvin" , Thomas Gleixner , devel@driverdev.osuosl.org, linux-s390@vger.kernel.org, lguest@lists.ozlabs.org, linux-c6x-dev@linux-c6x.org, linux-hexagon@vger.kernel.org, linux-sh@vger.kernel.org, linux-acpi@vger.kernel.org, Ingo Molnar , xen-devel@lists.xenproject.org, Guenter Roeck , devicetree@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net, linux-pm@vger.kernel.org, adi-buildroot-devel@lists.sourceforge.net, linux-m68k@lists.linux-m68k.org, linux-am33-list@redhat.com, linux-tegra@vger.kernel.org, openipmi-developer@lists.sourceforge.net, linux-metag@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-parisc@vger.kernel.org, linux-cris-kernel@axis.com, Jiri Kosina , linux-alpha@vger.kernel.org, linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Register with kernel poweroff handler instead of setting pm_power_off directly. Register with high priority value of 192 to reflect that the original code overwrites existing poweroff handlers. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Cc: Jiri Kosina Signed-off-by: Guenter Roeck --- arch/x86/kernel/apm_32.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 5848744..84566a6 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -219,6 +219,7 @@ #include #include #include +#include #include #include #include @@ -981,7 +982,8 @@ recalc: * on their first cpu. */ -static void apm_power_off(void) +static int apm_power_off(struct notifier_block *this, unsigned long unused1, + void *unused2) { /* Some bioses don't like being called from CPU != 0 */ if (apm_info.realmode_power_off) { @@ -990,8 +992,14 @@ static void apm_power_off(void) } else { (void)set_system_power_state(APM_STATE_OFF); } + return NOTIFY_DONE; } +static struct notifier_block apm_poweroff_nb = { + .notifier_call = apm_power_off, + .priority = 192, +}; + #ifdef CONFIG_APM_DO_ENABLE /** @@ -1847,8 +1855,11 @@ static int apm(void *unused) } /* Install our power off handler.. */ - if (power_off) - pm_power_off = apm_power_off; + if (power_off) { + error = register_poweroff_handler(&apm_poweroff_nb); + if (error) + pr_err("apm: Failed to register poweroff handler\n"); + } if (num_online_cpus() == 1 || smp) { #if defined(CONFIG_APM_DISPLAY_BLANK) && defined(CONFIG_VT) @@ -2408,9 +2419,8 @@ static void __exit apm_exit(void) apm_error("disengage power management", error); } misc_deregister(&apm_device); + unregister_poweroff_handler(&apm_poweroff_nb); remove_proc_entry("apm", NULL); - if (power_off) - pm_power_off = NULL; if (kapmd_task) { kthread_stop(kapmd_task); kapmd_task = NULL; -- 1.9.1