diff --git a/[refs] b/[refs]
index bed42a841151..206116e3dd60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f03839236392f5bc6107af5c9f749e8a48cd616c
+refs/heads/master: f6412b742ac754b4bbf3acaa9c05f825505671a1
diff --git a/trunk/arch/powerpc/platforms/cell/beat_htab.c b/trunk/arch/powerpc/platforms/cell/beat_htab.c
index 943c9d39aa16..b83077e13161 100644
--- a/trunk/arch/powerpc/platforms/cell/beat_htab.c
+++ b/trunk/arch/powerpc/platforms/cell/beat_htab.c
@@ -259,7 +259,7 @@ static void beat_lpar_hpte_updateboltedpp(unsigned long newpp,
 	u64 dummy0, dummy1;
 
 	vsid = get_kernel_vsid(ea, MMU_SEGSIZE_256M);
-	va = (vsid << 28) | (ea & 0x0fffffff);
+	va = hpt_va(ea, vsid, MMU_SEGSIZE_256M);
 
 	raw_spin_lock(&beat_htab_lock);
 	slot = beat_lpar_hpte_find(va, psize);