From c6abce7f86b7ccaaf98a03ba741b20cbe9f67d16 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Wed, 22 Feb 2006 16:15:45 -0800
Subject: [PATCH] --- yaml --- r: 21519 b: refs/heads/master c:
 fc504928677049f0ad3f1fd4e0bb3908172df8f3 h: refs/heads/master i:   21517:
 6b0347fc69f8ec8ca81696c229045245553d84d5   21515:
 604e1724a9f1763f3a81927734bd2718593722dc   21511:
 5d322ed7a34f2d504cbb4557ea7c74339bcbc43f   21503:
 f10775e2cb34d2b69e366cd0dc016f6f54c462d8 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/sparc64/kernel/rtrap.S | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 410cb8d2bd2b..472b9921dd9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7744a09504d5ae84edc8289a02254e1f2102410
+refs/heads/master: fc504928677049f0ad3f1fd4e0bb3908172df8f3
diff --git a/trunk/arch/sparc64/kernel/rtrap.S b/trunk/arch/sparc64/kernel/rtrap.S
index 1e724fe172ae..7130e866f935 100644
--- a/trunk/arch/sparc64/kernel/rtrap.S
+++ b/trunk/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)