1 files changed, 2 insertions, 1 deletions

diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S
index 1e724fe172ae..7130e866f935 100644
--- a/arch/sparc64/kernel/rtrap.S
+++ b/arch/sparc64/kernel/rtrap.S
@@ -333,7 +333,6 @@ user_rtt_fill_fixup:
 
                 mov     %g6, %l1
                 wrpr    %g0, 0x0, %tl
-                wrpr    %g0, RTRAP_PSTATE, %pstate
 
 661:            nop
                 .section                .sun4v_1insn_patch, "ax"
@@ -341,6 +340,8 @@ user_rtt_fill_fixup:
                 SET_GL(0)
                 .previous
 
+                wrpr    %g0, RTRAP_PSTATE, %pstate
+
                 mov     %l1, %g6
                 ldx     [%g6 + TI_TASK], %g4
                 LOAD_PER_CPU_BASE(%g5, %g6, %g1, %g2, %g3)