Module Name: src
Committed By: skrll
Date: Sun Jan 17 08:50:04 UTC 2010
Modified Files:
src/sys/arch/hppa/hppa: trap.c vm_machdep.c
Log Message:
Use pmap_extract instead of kvtop.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/hppa/hppa/trap.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/hppa/hppa/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/hppa/hppa/trap.c
diff -u src/sys/arch/hppa/hppa/trap.c:1.70 src/sys/arch/hppa/hppa/trap.c:1.71
--- src/sys/arch/hppa/hppa/trap.c:1.70 Sat Jan 16 13:29:47 2010
+++ src/sys/arch/hppa/hppa/trap.c Sun Jan 17 08:50:04 2010
@@ -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 @@
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:
Index: src/sys/arch/hppa/hppa/vm_machdep.c
diff -u src/sys/arch/hppa/hppa/vm_machdep.c:1.39 src/sys/arch/hppa/hppa/vm_machdep.c:1.40
--- src/sys/arch/hppa/hppa/vm_machdep.c:1.39 Sun Nov 29 04:15:42 2009
+++ src/sys/arch/hppa/hppa/vm_machdep.c Sun Jan 17 08:50:04 2010
@@ -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 @@
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 @@
* 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
