[src/trunk]: src/sys/arch/mips/mips Get rid of l_addr references pulled in vi...

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

details:   https://anonhg.NetBSD.org/src/rev/5959aa777827
branches:  trunk
changeset: 750013:5959aa777827
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Dec 14 04:37:02 2009 +0000

description:
Get rid of l_addr references pulled in via merge.

diffstat:

 sys/arch/mips/mips/netbsd32_machdep.c |  8 +++++---
 sys/arch/mips/mips/vm_machdep.c       |  6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (57 lines):

diff -r 015b8f02e3e7 -r 5959aa777827 sys/arch/mips/mips/netbsd32_machdep.c
--- a/sys/arch/mips/mips/netbsd32_machdep.c     Mon Dec 14 04:09:38 2009 +0000
+++ b/sys/arch/mips/mips/netbsd32_machdep.c     Mon Dec 14 04:37:02 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_machdep.c,v 1.2 2009/12/14 00:46:07 matt Exp $        */
+/*     $NetBSD: netbsd32_machdep.c,v 1.3 2009/12/14 04:37:02 matt Exp $        */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.2 2009/12/14 00:46:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.3 2009/12/14 04:37:02 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_sa.h"
@@ -308,8 +308,10 @@
 
        if ((l->l_md.md_flags & MDP_FPUSED) && l == fpcurlwp)
                savefpregs(l);
+
+       struct pcb * const pcb = lwp_getpcb(l);
        cpustate.frame = *l->l_md.md_regs;
-       cpustate.fpregs = l->l_addr->u_pcb.pcb_fpregs;
+       cpustate.fpregs = pcb->pcb_fpregs;
 
        CORE_SETMAGIC(cseg, CORESEGMAGIC, MID_MACHINE, CORE_CPU);
        cseg.c_addr = 0;
diff -r 015b8f02e3e7 -r 5959aa777827 sys/arch/mips/mips/vm_machdep.c
--- a/sys/arch/mips/mips/vm_machdep.c   Mon Dec 14 04:09:38 2009 +0000
+++ b/sys/arch/mips/mips/vm_machdep.c   Mon Dec 14 04:37:02 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm_machdep.c,v 1.129 2009/12/14 00:46:07 matt Exp $    */
+/*     $NetBSD: vm_machdep.c,v 1.130 2009/12/14 04:37:02 matt Exp $    */
 
 /*
  * Copyright (c) 1992, 1993
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.129 2009/12/14 00:46:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.130 2009/12/14 04:37:02 matt Exp $");
 
 #include "opt_ddb.h"
 
@@ -195,7 +195,7 @@
        struct pcb *pcb = lwp_getpcb(l);
        struct frame *f = l->l_md.md_regs;
 
-       KASSERT(f == (struct frame *)((char *)l->l_addr + USPACE) - 1);
+       KASSERT(f == (struct frame *)((uintptr_t)uvm_lwp_getuarea(l) + USPACE) - 1);
 
        pcb->pcb_context.val[_L_S0] = (intptr_t)func;                   /* S0 */
        pcb->pcb_context.val[_L_S1] = (intptr_t)arg;                    /* S1 */