[src/netbsd-6]: src/sys/arch/sparc64/sparc64 Pull up following revision(s) (r...

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

details:   https://anonhg.NetBSD.org/src/rev/a6f1bc5f9a75
branches:  netbsd-6
changeset: 776924:a6f1bc5f9a75
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Mar 24 08:51:14 2015 +0000

description:
Pull up following revision(s) (requested by nakayama in ticket #1265):
        sys/arch/sparc64/sparc64/locore.s: revision 1.380
PANICSTACK is a pointer itself, not a pointer to pointer.

diffstat:

 sys/arch/sparc64/sparc64/locore.s |  10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diffs (31 lines):

diff -r 9287b15a7ac9 -r a6f1bc5f9a75 sys/arch/sparc64/sparc64/locore.s
--- a/sys/arch/sparc64/sparc64/locore.s Thu Mar 19 16:46:02 2015 +0000
+++ b/sys/arch/sparc64/sparc64/locore.s Tue Mar 24 08:51:14 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.338.8.5 2013/12/14 19:33:28 bouyer Exp $  */
+/*     $NetBSD: locore.s,v 1.338.8.6 2015/03/24 08:51:14 snj Exp $     */
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -1890,9 +1890,7 @@
        wrpr    %g0, 0, %otherwin
        or      %lo(2f), %o0, %o0
        wrpr    %g0, WSTATE_KERN, %wstate
-       sethi   %hi(PANICSTACK), %sp
-       LDPTR   [%sp + %lo(PANICSTACK)], %sp
-       add     %sp, -CC64FSZ-STKB, %sp
+       set     PANICSTACK-CC64FSZ-STKB, %sp
        ta      1; nop                                  ! This helps out traptrace.
        call    _C_LABEL(panic)                         ! This needs to be fixed properly but we should panic here
         mov    %g1, %o1
@@ -2570,9 +2568,7 @@
        cmp     %g7, WSTATE_KERN
        bnz,pt  %icc, 1f                ! User stack -- we'll blow it away
         nop
-       sethi   %hi(PANICSTACK), %sp
-       LDPTR   [%sp + %lo(PANICSTACK)], %sp
-       add     %sp, -CC64FSZ-STKB, %sp 
+       set     PANICSTACK-CC64FSZ-STKB, %sp
 1:
 #endif
        rdpr    %tt, %g4