[RFC PATCH 03/16] parisc: support poweroff through poweroff handler call chain
From: linux@roeck-us.net (Guenter Roeck)
Date: 2014-09-30 18:01:26
Also in:
linux-mips, linux-pm, linux-sh, lkml
Subsystem:
parisc architecture, the rest · Maintainers:
"James E.J. Bottomley", Helge Deller, Linus Torvalds
The kernel core now supports a poweroff handler call chain to remove power from the system. Call it from machine_power_off. Also, do not use pm_power_off as alternate pointer to machine_power_off. Have the parisc/power driver call kernel_power_off() which in turn will call machine_power_off(). Cc: James E.J. Bottomley <redacted> Cc: Helge Deller <deller@gmx.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- arch/parisc/kernel/process.c | 7 +++++-- drivers/parisc/power.c | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 0bbbf0d..21d1ab3 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c@@ -42,6 +42,7 @@ #include <linux/module.h> #include <linux/personality.h> #include <linux/ptrace.h> +#include <linux/reboot.h> #include <linux/sched.h> #include <linux/slab.h> #include <linux/stddef.h>
@@ -133,7 +134,9 @@ void machine_power_off(void) pdc_soft_power_button(0); pdc_chassis_send_status(PDC_CHASSIS_DIRECT_SHUTDOWN); - + + do_kernel_poweroff(); + /* It seems we have no way to power the system off via * software. The user has to press the button himself. */
@@ -141,7 +144,7 @@ void machine_power_off(void) "Please power this system off now."); } -void (*pm_power_off)(void) = machine_power_off; +void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); /*
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index 90cca5e..de5b2ff 100644
--- a/drivers/parisc/power.c
+++ b/drivers/parisc/power.c@@ -95,8 +95,7 @@ static void process_shutdown(void) /* send kill signal */ if (kill_cad_pid(SIGINT, 1)) { /* just in case killing init process failed */ - if (pm_power_off) - pm_power_off(); + kernel_power_off(); } } }
--
1.9.1