| Message ID | 20211027211715.12671-17-digetx@gmail.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | Introduce power-off+restart call chain API | expand |
On 10/27/21 23:16, Dmitry Osipenko wrote: > Kernel now supports chained power-off handlers. Use do_kernel_power_off() > that invokes chained power-off handlers. It also invokes legacy > pm_power_off() for now, which will be removed once all drivers will > be converted to the new power-off API. > > Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Acked-by: Helge Deller <deller@gmx.de> # parisc > --- > arch/parisc/kernel/process.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c > index ea3d83b6fb62..928201b1f58f 100644 > --- a/arch/parisc/kernel/process.c > +++ b/arch/parisc/kernel/process.c > @@ -26,6 +26,7 @@ > #include <linux/module.h> > #include <linux/personality.h> > #include <linux/ptrace.h> > +#include <linux/reboot.h> > #include <linux/sched.h> > #include <linux/sched/debug.h> > #include <linux/sched/task.h> > @@ -114,8 +115,7 @@ void machine_power_off(void) > pdc_chassis_send_status(PDC_CHASSIS_DIRECT_SHUTDOWN); > > /* ipmi_poweroff may have been installed. */ > - if (pm_power_off) > - pm_power_off(); > + do_kernel_power_off(); > > /* It seems we have no way to power the system off via > * software. The user has to press the button himself. */ >
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index ea3d83b6fb62..928201b1f58f 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c @@ -26,6 +26,7 @@ #include <linux/module.h> #include <linux/personality.h> #include <linux/ptrace.h> +#include <linux/reboot.h> #include <linux/sched.h> #include <linux/sched/debug.h> #include <linux/sched/task.h> @@ -114,8 +115,7 @@ void machine_power_off(void) pdc_chassis_send_status(PDC_CHASSIS_DIRECT_SHUTDOWN); /* ipmi_poweroff may have been installed. */ - if (pm_power_off) - pm_power_off(); + do_kernel_power_off(); /* It seems we have no way to power the system off via * software. The user has to press the button himself. */
Kernel now supports chained power-off handlers. Use do_kernel_power_off() that invokes chained power-off handlers. It also invokes legacy pm_power_off() for now, which will be removed once all drivers will be converted to the new power-off API. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- arch/parisc/kernel/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)