diff --git a/[refs] b/[refs]
index 49df36bf4b21..080b7133d3e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1daef08a12157923d90ec7a47ead8a97e0d243cc
+refs/heads/master: de635d833f61ce0f2ad0b3431e6a3323a1c4fed5
diff --git a/trunk/arch/sparc64/mm/tsb.c b/trunk/arch/sparc64/mm/tsb.c
index 975242ab88ee..3c1ff05038b1 100644
--- a/trunk/arch/sparc64/mm/tsb.c
+++ b/trunk/arch/sparc64/mm/tsb.c
@@ -58,7 +58,7 @@ void flush_tsb_user(struct mmu_gather *mp)
 
 	ctx = CTX_HWBITS(mm->context);
 
-	if (tlb_type == cheetah_plus)
+	if (tlb_type == cheetah_plus || tlb_type == hypervisor)
 		base = __pa(tsb);
 	else
 		base = (unsigned long) tsb;