summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>1999-06-06 15:38:34 +0000
committerderaadt <deraadt@openbsd.org>1999-06-06 15:38:34 +0000
commit2b049e33bffea3bef3731f0a5a88aaa99270edbd (patch)
tree0c8dd005ec495c07b6c81b508e2a35eba121c2b1
parentuse dot_quad_addr_new() as required (diff)
downloadwireguard-openbsd-2b049e33bffea3bef3731f0a5a88aaa99270edbd.tar.xz
wireguard-openbsd-2b049e33bffea3bef3731f0a5a88aaa99270edbd.zip
pmap callout changes for uvm; art
-rw-r--r--sys/arch/mvme68k/mvme68k/sys_machdep.c4
-rw-r--r--sys/arch/mvme68k/mvme68k/trap.c4
-rw-r--r--sys/arch/mvme68k/mvme68k/vm_machdep.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/mvme68k/mvme68k/sys_machdep.c b/sys/arch/mvme68k/mvme68k/sys_machdep.c
index a85779822b0..736457d888a 100644
--- a/sys/arch/mvme68k/mvme68k/sys_machdep.c
+++ b/sys/arch/mvme68k/mvme68k/sys_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_machdep.c,v 1.5 1996/04/28 10:59:13 deraadt Exp $ */
+/* $OpenBSD: sys_machdep.c,v 1.6 1999/06/06 15:38:34 deraadt Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -168,7 +168,7 @@ cachectl(req, addr, len)
*/
if (!doall &&
(pa == 0 || ((int)addr & PGOFSET) == 0)) {
- pa = pmap_extract(&curproc->p_vmspace->vm_pmap,
+ pa = pmap_extract(curproc->p_vmspace->vm_map.pmap,
(vm_offset_t)addr);
if (pa == 0)
doall = 1;
diff --git a/sys/arch/mvme68k/mvme68k/trap.c b/sys/arch/mvme68k/mvme68k/trap.c
index 339f8513cf6..a884829bd9f 100644
--- a/sys/arch/mvme68k/mvme68k/trap.c
+++ b/sys/arch/mvme68k/mvme68k/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.19 1998/04/03 03:47:42 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.20 1999/06/06 15:38:34 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -946,7 +946,7 @@ dumpwb(num, s, a, d)
num, a, d, f7sz[(s & SSW4_SZMASK) >> 5],
f7tt[(s & SSW4_TTMASK) >> 3], f7tm[s & SSW4_TMMASK]);
printf(" PA ");
- pa = pmap_extract(&p->p_vmspace->vm_pmap, (vm_offset_t)a);
+ pa = pmap_extract(p->p_vmspace->vm_map.pmap, (vm_offset_t)a);
if (pa == 0)
printf("<invalid address>");
else
diff --git a/sys/arch/mvme68k/mvme68k/vm_machdep.c b/sys/arch/mvme68k/mvme68k/vm_machdep.c
index 982b3c45290..49b501eebde 100644
--- a/sys/arch/mvme68k/mvme68k/vm_machdep.c
+++ b/sys/arch/mvme68k/mvme68k/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.10 1999/01/10 13:34:18 niklas Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.11 1999/06/06 15:38:34 deraadt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -80,7 +80,7 @@ cpu_fork(p1, p2)
savectx(curpcb);
*pcb = p1->p_addr->u_pcb;
- PMAP_ACTIVATE(&p2->p_vmspace->vm_pmap, pcb, 0);
+ PMAP_ACTIVATE(p2->p_vmspace->vm_map.pmap, pcb, 0);
/*
* Copy the trap frame, and arrange for the child to return directly