Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use pmap_extract instead of kvtop.

Browse Source
This commit is contained in:
skrll 2010-01-17 08:50:04 +00:00
parent 92ae846d27
commit 115d3c7160
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/hppa/hppa/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.70 2010/01/16 13:29:47 skrll Exp $ */
/* $NetBSD: trap.c,v 1.71 2010/01/17 08:50:04 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.70 2010/01/16 13:29:47 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.71 2010/01/17 08:50:04 skrll Exp $");
/* #define INTRDEBUG */
/* #define TRAPDEBUG */
@ -462,10 +462,15 @@ do { \
SANITY(l != NULL || (tf->tf_sp >= minsp && tf->tf_sp < maxsp));
} else {
bool ok;
paddr_t pa;
ok = pmap_extract(pmap_kernel(), uvm_lwp_getuarea(l), &pa);
KASSERT(ok);
SANITY(USERMODE(tf->tf_iioq_head));
SANITY(USERMODE(tf->tf_iioq_tail));
SANITY(l != NULL &&
tf->tf_cr30 == kvtop((void *)uvm_lwp_getuarea(l)));
SANITY(l != NULL && tf->tf_cr30 == pa);
}
#undef SANITY
out:

9
sys/arch/hppa/hppa/vm_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vm_machdep.c,v 1.39 2009/11/29 04:15:42 rmind Exp $ */
/* $NetBSD: vm_machdep.c,v 1.40 2010/01/17 08:50:04 skrll Exp $ */
/* $OpenBSD: vm_machdep.c,v 1.64 2008/09/30 18:54:26 miod Exp $ */
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.39 2009/11/29 04:15:42 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.40 2010/01/17 08:50:04 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -54,6 +54,7 @@ static inline void
cpu_activate_pcb(struct lwp *l)
{
struct trapframe *tf = l->l_md.md_regs;
bool ok;
struct pcb *pcb = lwp_getpcb(l);
vaddr_t uarea = (vaddr_t)pcb;
#ifdef DIAGNOSTIC
@ -64,7 +65,9 @@ cpu_activate_pcb(struct lwp *l)
* Stash the physical for the pcb of U for later perusal
*/
pcb->pcb_uva = uarea;
tf->tf_cr30 = kvtop((void *)uarea);
ok = pmap_extract(pmap_kernel(), uarea, (paddr_t *)&tf->tf_cr30);
KASSERT(ok);
fdcache(HPPA_SID_KERNEL, (vaddr_t)pcb, sizeof(struct pcb));
#ifdef DIAGNOSTIC