From 0db2deefd8c32889520e762c5fa6c0824a462f89 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Mon, 19 Nov 2012 23:01:34 +0000
Subject: [PATCH] --- yaml --- r: 343566 b: refs/heads/master c:
 4879f241720cda3e6c18a1713bf9b2ed2de14ee4 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/powerpc/kvm/book3s_hv_rm_mmu.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 07e7d5d22e90..2c1648ff0f00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ed661bf852cefa1ab57ad709a675bfb029d47ab
+refs/heads/master: 4879f241720cda3e6c18a1713bf9b2ed2de14ee4
diff --git a/trunk/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/trunk/arch/powerpc/kvm/book3s_hv_rm_mmu.c
index 362dffe4db10..ff2da5ce475c 100644
--- a/trunk/arch/powerpc/kvm/book3s_hv_rm_mmu.c
+++ b/trunk/arch/powerpc/kvm/book3s_hv_rm_mmu.c
@@ -59,10 +59,10 @@ void kvmppc_add_revmap_chain(struct kvm *kvm, struct revmap_entry *rev,
 		head->back = pte_index;
 	} else {
 		rev->forw = rev->back = pte_index;
-		i = pte_index;
+		*rmap = (*rmap & ~KVMPPC_RMAP_INDEX) |
+			pte_index | KVMPPC_RMAP_PRESENT;
 	}
-	smp_wmb();
-	*rmap = i | KVMPPC_RMAP_REFERENCED | KVMPPC_RMAP_PRESENT; /* unlock */
+	unlock_rmap(rmap);
 }
 EXPORT_SYMBOL_GPL(kvmppc_add_revmap_chain);