> -----Original Message----- > From: kvm-ppc-owner@xxxxxxxxxxxxxxx [mailto:kvm-ppc- > owner@xxxxxxxxxxxxxxx] On Behalf Of Bharat Bhushan > Sent: Thursday, July 17, 2014 2:32 PM > To: agraf@xxxxxxx; kvm-ppc@xxxxxxxxxxxxxxx > Cc: kvm@xxxxxxxxxxxxxxx; Wood Scott-B07421; Yoder Stuart-B08248; Bhushan > Bharat-R65777 > Subject: [PATCH 6/6 v2] kvm: ppc: Add SPRN_EPR get helper function > > kvmppc_set_epr() is already defined in asm/kvm_ppc.h, So > rename and move get_epr helper function to same file. > > Signed-off-by: Bharat Bhushan <Bharat.Bhushan@xxxxxxxxxxxxx> > --- > v1->v2 > - vcpu->arch.epr under CONFIG_BOOKE > > arch/powerpc/include/asm/kvm_ppc.h | 10 ++++++++++ > arch/powerpc/kvm/booke.c | 11 +---------- > 2 files changed, 11 insertions(+), 10 deletions(-) > > diff --git a/arch/powerpc/include/asm/kvm_ppc.h > b/arch/powerpc/include/asm/kvm_ppc.h > index 58a5202..14e2d87 100644 > --- a/arch/powerpc/include/asm/kvm_ppc.h > +++ b/arch/powerpc/include/asm/kvm_ppc.h > @@ -395,6 +395,16 @@ static inline int kvmppc_xics_hcall(struct kvm_vcpu > *vcpu, u32 cmd) > { return 0; } > #endif > > +static inline unsigned long kvmppc_get_epr(struct kvm_vcpu *vcpu) > +{ > +#ifdef CONFIG_KVM_BOOKE_HV > + return mfspr(SPRN_GEPR); > +#elif defined(CONFIG_BOOKE) > + return vcpu->arch.epr; > +#endif > + return 0; > +} > + > static inline void kvmppc_set_epr(struct kvm_vcpu *vcpu, u32 epr) > { > #ifdef CONFIG_KVM_BOOKE_HV EPR is a BookE resource, why don't we move the helpers to kvm_booke.h? -Mike -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
