Commit ce236ab5 authored Oct 16, 2012 by Aneesh Kumar K.V Committed by Benjamin Herrenschmidt Oct 18, 2012

powerpc: Build fix for powerpc KVM

Fix build failure for powerpc KVM by adding missing VPN_SHIFT definition
and the ';'

arch/powerpc/kvm/book3s_32_mmu_host.c: In function 'kvmppc_mmu_map_page':
arch/powerpc/kvm/book3s_32_mmu_host.c:176: error: 'VPN_SHIFT' undeclared (first use in this function)
arch/powerpc/kvm/book3s_32_mmu_host.c:176: error: (Each undeclared identifier is reported only once
arch/powerpc/kvm/book3s_32_mmu_host.c:176: error: for each function it appears in.)
arch/powerpc/kvm/book3s_32_mmu_host.c:178: error: expected ';' before 'next_pteg'
arch/powerpc/kvm/book3s_32_mmu_host.c:190: error: label 'next_pteg' used but not defined
make[1]: *** [arch/powerpc/kvm/book3s_32_mmu_host.o] Error 1

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent 72523d80

arch/powerpc/include/asm/kvm_book3s_32.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

		#endif /* __ASM_KVM_BOOK3S_32_H__ */

arch/powerpc/kvm/book3s_32_mmu_host.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		next_pteg:
		if (rr == 16) {
		primary = !primary;