Module Name: src
Committed By: matt
Date: Mon Dec 14 04:37:02 UTC 2009
Modified Files:
src/sys/arch/mips/mips: netbsd32_machdep.c vm_machdep.c
Log Message:
Get rid of l_addr references pulled in via merge.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/mips/netbsd32_machdep.c
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/mips/mips/vm_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/netbsd32_machdep.c
diff -u src/sys/arch/mips/mips/netbsd32_machdep.c:1.2 src/sys/arch/mips/mips/netbsd32_machdep.c:1.3
--- src/sys/arch/mips/mips/netbsd32_machdep.c:1.2 Mon Dec 14 00:46:07 2009
+++ src/sys/arch/mips/mips/netbsd32_machdep.c Mon Dec 14 04:37:02 2009
@@ -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;
Index: src/sys/arch/mips/mips/vm_machdep.c
diff -u src/sys/arch/mips/mips/vm_machdep.c:1.129 src/sys/arch/mips/mips/vm_machdep.c:1.130
--- src/sys/arch/mips/mips/vm_machdep.c:1.129 Mon Dec 14 00:46:07 2009
+++ src/sys/arch/mips/mips/vm_machdep.c Mon Dec 14 04:37:02 2009
@@ -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 */
