Subject: Re: [PATCH] powerpc: Build fix for powerpc KVM

From: Michael Neuling <[email-masked]>
Date: Wed, 17 Oct 2012 09:15:21 +1100

Aneesh Kumar K.V <[email-masked]> wrote:

> From: "Aneesh Kumar K.V" <[email-masked]>
> 
> Fix build failure for powerpc KVM

What was the failure?

> 
> Signed-off-by: Aneesh Kumar K.V <[email-masked]>
> ---
>  arch/powerpc/include/asm/kvm_book3s_32.h |    1 +
>  arch/powerpc/kvm/book3s_32_mmu_host.c    |    4 ++--
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/powerpc/include/asm/kvm_book3s_32.h b/arch/powerpc/include/asm/kvm_book3s_32.h
> index 38040ff..ce0ef6c 100644
> --- a/arch/powerpc/include/asm/kvm_book3s_32.h
> +++ b/arch/powerpc/include/asm/kvm_book3s_32.h
> @@ -42,5 +42,6 @@ static inline void svcpu_put(struct kvmppc_book3s_shadow_vcpu *svcpu)
>  #define SID_SHIFT	28
>  #define ESID_MASK	0xf0000000
>  #define VSID_MASK	0x00fffffff0000000ULL
> +#define VPN_SHIFT	12

Is this the fix?

>  
>  #endif /* __ASM_KVM_BOOK3S_32_H__ */
> diff --git a/arch/powerpc/kvm/book3s_32_mmu_host.c b/arch/powerpc/kvm/book3s_32_mmu_host.c
> index 00aa612..b0f625a 100644
> --- a/arch/powerpc/kvm/book3s_32_mmu_host.c
> +++ b/arch/powerpc/kvm/book3s_32_mmu_host.c
> @@ -173,8 +173,8 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte)
>  	BUG_ON(!map);
>  
>  	vsid = map->host_vsid;
> -	vpn = (vsid << (SID_SHIFT - VPN_SHIFT)) | ((eaddr & ~ESID_MASK) >> VPN_SHIFT)
> -
> +	vpn = (vsid << (SID_SHIFT - VPN_SHIFT)) |
> +		((eaddr & ~ESID_MASK) >> VPN_SHIFT);

This just seems to be a white space change.

Mikey

>  next_pteg:
>  	if (rr == 16) {
>  		primary = !primary;
> -- 
> 1.7.10
> 
> _______________________________________________
> Linuxppc-dev mailing list
> [email-masked]
> https://lists.ozlabs.org/listinfo/linuxppc-dev
>