On Mon, May 23, 2016 at 08:48:36PM +0530, Shreyas B. Prabhu wrote: > Functions like power7_wakeup_loss, power7_wakeup_noloss, > power7_wakeup_tb_loss are used by POWER7 and POWER8 hardware. They can > also be used by POWER9. Hence rename these functions hardware agnostic > names. > > Suggested-by: Gautham R. Shenoy <e...@linux.vnet.ibm.com> > Signed-off-by: Shreyas B. Prabhu <shre...@linux.vnet.ibm.com> > --- > New in v3 > > arch/powerpc/kernel/exceptions-64s.S | 6 +++--- > arch/powerpc/kernel/idle_power_common.S | 16 ++++++++-------- > arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 ++-- > 3 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/arch/powerpc/kernel/exceptions-64s.S > b/arch/powerpc/kernel/exceptions-64s.S > index 4a74d6a..a0da627 100644 > --- a/arch/powerpc/kernel/exceptions-64s.S > +++ b/arch/powerpc/kernel/exceptions-64s.S > @@ -108,7 +108,7 @@ BEGIN_FTR_SECTION > > cmpwi cr3,r13,2 > GET_PACA(r13) > - bl power7_restore_hyp_resource > + bl pnv_restore_hyp_resource > > li r0,PNV_THREAD_RUNNING > stb r0,PACA_THREAD_IDLE_STATE(r13) /* Clear thread state */ > @@ -128,8 +128,8 @@ BEGIN_FTR_SECTION > /* Return SRR1 from power7_nap() */ > mfspr r3,SPRN_SRR1 > blt cr3,2f > - b power7_wakeup_loss > -2: b power7_wakeup_noloss > + b pnv_wakeup_loss > +2: b pnv_wakeup_noloss > > 9: > END_FTR_SECTION_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206) > diff --git a/arch/powerpc/kernel/idle_power_common.S > b/arch/powerpc/kernel/idle_power_common.S > index db59613..973c9a1 100644 > --- a/arch/powerpc/kernel/idle_power_common.S > +++ b/arch/powerpc/kernel/idle_power_common.S
The comment at the beginning of idle_power_common.S still reads "This file contains the power_save function for Power7 CPUs." Please update that as well. Reviewed-by: Gautham R. Shenoy <e...@linux.vnet.ibm.com>
