[src/trunk]: src/sys/arch/sparc64/sparc64 Disable interrupts after calling da...

[nakayama <nakayama%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d9aa500ee8dc
branches:  trunk
changeset: 786967:d9aa500ee8dc
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Fri May 24 23:02:27 2013 +0000

description:
Disable interrupts after calling data_access_error as with
data_access_fault.

diffstat:

 sys/arch/sparc64/sparc64/locore.s |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r bf0b4b83b649 -r d9aa500ee8dc sys/arch/sparc64/sparc64/locore.s
--- a/sys/arch/sparc64/sparc64/locore.s Fri May 24 23:02:08 2013 +0000
+++ b/sys/arch/sparc64/sparc64/locore.s Fri May 24 23:02:27 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.348 2013/04/28 23:42:23 nakayama Exp $    */
+/*     $NetBSD: locore.s,v 1.349 2013/05/24 23:02:27 nakayama Exp $    */
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -2234,7 +2234,6 @@
        call    _C_LABEL(data_access_fault)     ! data_access_fault(&tf, type, 
                                                !       pc, addr, sfva, sfsr)
         add    %sp, CC64FSZ + STKB, %o0        ! (argument: &tf)
-       wrpr    %g0, PSTATE_KERN, %pstate               ! disable interrupts
 
 data_recover:
 #ifdef TRAPSTATS
@@ -2243,6 +2242,7 @@
        set     _C_LABEL(iveccnt), %g1
        stw     %g0, [%g1]
 #endif
+       wrpr    %g0, PSTATE_KERN, %pstate               ! disable interrupts
        b       return_from_trap                        ! go return
         ldx    [%sp + CC64FSZ + STKB + TF_TSTATE], %g1         ! Load this for return_from_trap
        NOTREACHED