| Message ID | 1412100056-15517-6-git-send-email-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On Tue, Sep 30, 2014 at 07:00:45PM +0100, Guenter Roeck wrote: > The kernel core now supports a poweroff handler call chain > to remove power from the system. Call it if pm_power_off > is set to NULL. > > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- > arch/arm64/kernel/process.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c > index 398ab05..cc0c63e 100644 > --- a/arch/arm64/kernel/process.c > +++ b/arch/arm64/kernel/process.c > @@ -157,6 +157,8 @@ void machine_power_off(void) > smp_send_stop(); > if (pm_power_off) > pm_power_off(); > + else > + do_kernel_poweroff(); Acked-by: Catalin Marinas <catalin.marinas@arm.com> As others already stated, I think we should eventually remove pm_power_off entirely. Catalin -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/03/2014 03:30 AM, Catalin Marinas wrote: > On Tue, Sep 30, 2014 at 07:00:45PM +0100, Guenter Roeck wrote: >> The kernel core now supports a poweroff handler call chain >> to remove power from the system. Call it if pm_power_off >> is set to NULL. >> >> Cc: Catalin Marinas <catalin.marinas@arm.com> >> Cc: Will Deacon <will.deacon@arm.com> >> Signed-off-by: Guenter Roeck <linux@roeck-us.net> >> --- >> arch/arm64/kernel/process.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c >> index 398ab05..cc0c63e 100644 >> --- a/arch/arm64/kernel/process.c >> +++ b/arch/arm64/kernel/process.c >> @@ -157,6 +157,8 @@ void machine_power_off(void) >> smp_send_stop(); >> if (pm_power_off) >> pm_power_off(); >> + else >> + do_kernel_poweroff(); > > Acked-by: Catalin Marinas <catalin.marinas@arm.com> > > As others already stated, I think we should eventually remove > pm_power_off entirely. > Hi Catalin, yes, already working on it. As suggested by others, I'll move pm_power_off to a central location (no need to declare the same variable for each architecture) and hide the call to it in do_kernel_poweroff() as a first step. You'll see this in the next version of the series. This will make it much easier to remove it later on. Thanks, Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 398ab05..cc0c63e 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -157,6 +157,8 @@ void machine_power_off(void) smp_send_stop(); if (pm_power_off) pm_power_off(); + else + do_kernel_poweroff(); } /*
The kernel core now supports a poweroff handler call chain to remove power from the system. Call it if pm_power_off is set to NULL. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- arch/arm64/kernel/process.c | 2 ++ 1 file changed, 2 insertions(+)