| Message ID | 20170511151522.4772-1-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 67d20418088680d22037119d914982cd982b5c5a |
| Headers | show |
Hi Nick, On Fri, May 12, 2017 at 01:15:20AM +1000, Nicholas Piggin wrote: > Fixes: a7cd88da97 ("powerpc/powernv: Move CPU-Offline idle state invocation from smp.c to idle.c") > Cc: Gautham R. Shenoy <ego@linux.vnet.ibm.com> > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > arch/powerpc/platforms/powernv/idle.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c > index 445f30a2c5ef..0c21747ed7e0 100644 > --- a/arch/powerpc/platforms/powernv/idle.c > +++ b/arch/powerpc/platforms/powernv/idle.c > @@ -261,6 +261,7 @@ static u64 pnv_deepest_stop_psscr_val; > static u64 pnv_deepest_stop_psscr_mask; > static bool deepest_stop_found; > > +#ifdef CONFIG_HOTPLUG_CPU > /* > * pnv_cpu_offline: A function that puts the CPU into the deepest > * available platform idle state on a CPU-Offline. > @@ -293,6 +294,7 @@ unsigned long pnv_cpu_offline(unsigned int cpu) > > return srr1; > } > +#endif Looks like the updated verison of "powerpc/powernv: Move CPU-Offline idle state invocation from smp.c to idle.c" (https://lkml.org/lkml/2017/3/30/235) wasn't picked. Thanks for catching this! Acked-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com> > > /* > * Power ISA 3.0 idle initialization. > -- > 2.11.0 > -- Thanks and Regards gautham.
On Thu, 2017-05-11 at 15:15:20 UTC, Nicholas Piggin wrote: > Fixes: a7cd88da97 ("powerpc/powernv: Move CPU-Offline idle state invocation from smp.c to idle.c") > Cc: Gautham R. Shenoy <ego@linux.vnet.ibm.com> > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > Acked-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/67d20418088680d22037119d914982 cheers
diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c index 445f30a2c5ef..0c21747ed7e0 100644 --- a/arch/powerpc/platforms/powernv/idle.c +++ b/arch/powerpc/platforms/powernv/idle.c @@ -261,6 +261,7 @@ static u64 pnv_deepest_stop_psscr_val; static u64 pnv_deepest_stop_psscr_mask; static bool deepest_stop_found; +#ifdef CONFIG_HOTPLUG_CPU /* * pnv_cpu_offline: A function that puts the CPU into the deepest * available platform idle state on a CPU-Offline. @@ -293,6 +294,7 @@ unsigned long pnv_cpu_offline(unsigned int cpu) return srr1; } +#endif /* * Power ISA 3.0 idle initialization.
Fixes: a7cd88da97 ("powerpc/powernv: Move CPU-Offline idle state invocation from smp.c to idle.c") Cc: Gautham R. Shenoy <ego@linux.vnet.ibm.com> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/platforms/powernv/idle.c | 2 ++ 1 file changed, 2 insertions(+)