---

yaml --- r: 21519 b: refs/heads/master c: fc50492 h: refs/heads/master i: 21517: 6b0347f 21515: 604e172 21511: 5d322ed 21503: f10775e v: v3
git-mirror · Mar 20, 2006 · c6abce7 · c6abce7
1 parent 40b55c0
commit c6abce7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -333,14 +333,15 @@ user_rtt_fill_fixup:
 
 		mov	%g6, %l1
 		wrpr	%g0, 0x0, %tl
-		wrpr	%g0, RTRAP_PSTATE, %pstate
 
 661:		nop
 		.section		.sun4v_1insn_patch, "ax"
 		.word			661b
 		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)