diff --git a/[refs] b/[refs]
index 1fcce685f7b4..84c979b0c37f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ff7ac417d4b628c23df3ae8301d17e29e6e8f16
+refs/heads/master: af02bec66294c76fba181c665c68a31fd4392020
diff --git a/trunk/arch/sparc64/kernel/rtrap.S b/trunk/arch/sparc64/kernel/rtrap.S
index 551f71982008..1e724fe172ae 100644
--- a/trunk/arch/sparc64/kernel/rtrap.S
+++ b/trunk/arch/sparc64/kernel/rtrap.S
@@ -234,8 +234,10 @@ rt_continue:	ldx			[%sp + PTREGS_OFF + PT_V9_G1], %g1
 
 		/* Normal globals are restored, go to trap globals.  */
 661:		wrpr			%g0, RTRAP_PSTATE_AG_IRQOFF, %pstate
-		.section		.sun4v_1insn_patch, "ax"
+		nop
+		.section		.sun4v_2insn_patch, "ax"
 		.word			661b
+		wrpr			%g0, RTRAP_PSTATE_IRQOFF, %pstate
 		SET_GL(1)
 		.previous