[SPARC64]: Fix return from trap on SUN4V.

We need to set the global register set _AND_ disable
PSTATE_IE in %pstate.  The original patch sequence was
leaving PSTATE_IE enabled when returning to kernel mode,
oops.

This fixes the random register corruption being seen
on SUN4V.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S
index 551f71982008685265767842d34f76b708c8b125..1e724fe172ae4581d26737c637453bdc37b8b75c 100644 (file)
--- a/arch/sparc64/kernel/rtrap.S
+++ b/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