diff --git a/[refs] b/[refs]
index 98888bd3e716..33d45bc84fb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14d2c68baa659cfd15dc782dd229ea304330c4f6
+refs/heads/master: ada44a0430fdd00b3f38aad0aa518e97cb760bd0
diff --git a/trunk/arch/sparc64/kernel/rtrap.S b/trunk/arch/sparc64/kernel/rtrap.S
index 3afacbb5781d..c6fc695fe1fe 100644
--- a/trunk/arch/sparc64/kernel/rtrap.S
+++ b/trunk/arch/sparc64/kernel/rtrap.S
@@ -363,6 +363,7 @@ kern_rtt:	rdpr			%canrestore, %g1
 		brz,pn			%g1, kern_rtt_fill
 		 nop
 kern_rtt_restore:
+		stw			%g0, [%sp + PTREGS_OFF + PT_V9_MAGIC]
 		restore
 		retry