From d6283cc99e1554b13d52c5897863f024827408c9 Mon Sep 17 00:00:00 2001
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Date: Tue, 16 Oct 2012 22:25:45 +0000
Subject: [PATCH] --- yaml --- r: 334478 b: refs/heads/master c:
 ce236ab576a2d76b1d6eb268221e74f05ed48d8b h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/powerpc/include/asm/kvm_book3s_32.h | 1 +
 trunk/arch/powerpc/kvm/book3s_32_mmu_host.c    | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index aaa432bf0a7e..b6efc8ee6547 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72523d8082df3d89bffe30cbc1356dbb45ab51ae
+refs/heads/master: ce236ab576a2d76b1d6eb268221e74f05ed48d8b
diff --git a/trunk/arch/powerpc/include/asm/kvm_book3s_32.h b/trunk/arch/powerpc/include/asm/kvm_book3s_32.h
index 38040ff82063..ce0ef6ce8f86 100644
--- a/trunk/arch/powerpc/include/asm/kvm_book3s_32.h
+++ b/trunk/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
 
 #endif /* __ASM_KVM_BOOK3S_32_H__ */
diff --git a/trunk/arch/powerpc/kvm/book3s_32_mmu_host.c b/trunk/arch/powerpc/kvm/book3s_32_mmu_host.c
index 00aa61268e0d..b0f625a33345 100644
--- a/trunk/arch/powerpc/kvm/book3s_32_mmu_host.c
+++ b/trunk/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);
 next_pteg:
 	if (rr == 16) {
 		primary = !primary;