From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Graf Subject: Re: [PATCH 6/6 v2] kvm: ppc: Add SPRN_EPR get helper function Date: Thu, 17 Jul 2014 15:44:54 +0200 Message-ID: <53C7D356.60301@suse.de> References: <1405596700-2699-1-git-send-email-Bharat.Bhushan@freescale.com> <1405596700-2699-7-git-send-email-Bharat.Bhushan@freescale.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, scottwood@freescale.com, stuart.yoder@freescale.com To: Bharat Bhushan , kvm-ppc@vger.kernel.org Return-path: In-Reply-To: <1405596700-2699-7-git-send-email-Bharat.Bhushan@freescale.com> Sender: kvm-ppc-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On 17.07.14 13:31, Bharat Bhushan wrote: > 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 > --- > 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; Let me change that to #else return 0; #endif Alex