diff --git a/[refs] b/[refs]
index 080b7133d3e9..6ebfef0d96e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de635d833f61ce0f2ad0b3431e6a3323a1c4fed5
+refs/heads/master: a7b31bac691668a60da8b9892124b7da408e0a0e
diff --git a/trunk/arch/sparc64/kernel/tsb.S b/trunk/arch/sparc64/kernel/tsb.S
index be8f0892d721..7996c9d66702 100644
--- a/trunk/arch/sparc64/kernel/tsb.S
+++ b/trunk/arch/sparc64/kernel/tsb.S
@@ -265,13 +265,19 @@ __tsb_context_switch:
 	mov	SCRATCHPAD_UTSBREG2, %g1
 	stxa	%g2, [%g1] ASI_SCRATCHPAD
 
+	/* Save away %o5's %pstate, we have to use %o5 for
+	 * the hypervisor call.
+	 */
+	mov	%o5, %g1
+
 	mov	HV_FAST_MMU_TSB_CTXNON0, %o5
 	mov	1, %o0
 	mov	%o4, %o1
 	ta	HV_FAST_TRAP
 
+	/* Finish up and restore %o5.  */
 	ba,pt	%xcc, 9f
-	 nop
+	 mov	%g1, %o5
 
 	/* SUN4U TSB switch.  */
 1:	mov	TSB_REG, %g1