[src/nathanw_sa]: src/sys/arch/sparc/sparc Fix merge botches.

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

details:   https://anonhg.NetBSD.org/src/rev/ae87255abc8f
branches:  nathanw_sa
changeset: 506760:ae87255abc8f
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jan 16 13:07:01 2003 +0000

description:
Fix merge botches.

diffstat:

 sys/arch/sparc/sparc/trap.c       |  8 ++++----
 sys/arch/sparc/sparc/vm_machdep.c |  4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 381b1c83dcd2 -r ae87255abc8f sys/arch/sparc/sparc/trap.c
--- a/sys/arch/sparc/sparc/trap.c       Thu Jan 16 10:39:49 2003 +0000
+++ b/sys/arch/sparc/sparc/trap.c       Thu Jan 16 13:07:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.106.8.26 2003/01/15 18:40:20 thorpej Exp $ */
+/*     $NetBSD: trap.c,v 1.106.8.27 2003/01/16 13:07:01 martin Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -222,7 +222,7 @@
        /* take pending signals */
        while ((sig = CURSIG(l)) != 0)
                postsig(sig);
-       l->p_priority = l->p_usrpri;
+       l->l_priority = l->l_usrpri;
        if (cpuinfo.want_ast) {
                cpuinfo.want_ast = 0;
                if (p->p_flag & P_OWEUPC) {
@@ -537,13 +537,13 @@
                        loadfpstate(fs);
                        cpuinfo.fplwp = l;              /* now we do have it */
                        l->l_md.md_fpu = curcpu();
-                       FPU_UNLOCK();
+                       FPU_UNLOCK(s);
                }
 #else
                if (cpuinfo.fplwp != l) {               /* we do not have it */
                        int mid;
 
-                       FPU_LOCK();
+                       FPU_LOCK(s);
                        mid = l->l_md.md_fpumid;
                        if (cpuinfo.fplwp != NULL) {    /* someone else had it*/
                                savefpstate(cpuinfo.fplwp->l_md.md_fpstate);
diff -r 381b1c83dcd2 -r ae87255abc8f sys/arch/sparc/sparc/vm_machdep.c
--- a/sys/arch/sparc/sparc/vm_machdep.c Thu Jan 16 10:39:49 2003 +0000
+++ b/sys/arch/sparc/sparc/vm_machdep.c Thu Jan 16 13:07:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm_machdep.c,v 1.60.4.12 2003/01/15 18:40:21 thorpej Exp $ */
+/*     $NetBSD: vm_machdep.c,v 1.60.4.13 2003/01/16 13:07:01 martin Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -244,7 +244,7 @@
                                panic("FPU(%d): fplwp %p",
                                        cpi->ci_cpuid, cpi->fplwp);
                        if (l1 == cpuinfo.fplwp)
-                               savefpstate(p1->p_md.md_fpstate);
+                               savefpstate(l1->l_md.md_fpstate);
 #if defined(MULTIPROCESSOR)
                        else
                                XCALL1(savefpstate, l1->l_md.md_fpstate,