pmap_activate() and pmap_deactivate() are MD

9 files changed, 43 insertions, 45 deletions

diff --git a/sys/arch/alpha/alpha/pmap.old.c b/sys/arch/alpha/alpha/pmap.old.c
index 197ccb5544f..89bb0ba6843 100644
--- a/sys/arch/alpha/alpha/pmap.old.c
+++ b/sys/arch/alpha/alpha/pmap.old.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.old.c,v 1.4 1999/07/18 16:45:41 deraadt Exp $	*/
+/*	$OpenBSD: pmap.old.c,v 1.5 1999/07/18 18:00:02 deraadt Exp $	*/
 /*	$NetBSD: pmap.old.c,v 1.14 1996/11/13 21:13:10 cgd Exp $	*/
 
 /* 
@@ -1392,10 +1392,9 @@ ok:
 }
 
 void
-pmap_activate(p)
-	struct proc *p;
+pmap_activate(pmap)
+	register pmap_t pmap;
 {
-	pmap_t pmap = p->p_vmspace->vm_map.pmap;
 	int iscurproc;
 
 #ifdef DEBUG
diff --git a/sys/arch/alpha/include/pmap.old.h b/sys/arch/alpha/include/pmap.old.h
index a3e9b5464d6..74cda716d32 100644
--- a/sys/arch/alpha/include/pmap.old.h
+++ b/sys/arch/alpha/include/pmap.old.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.old.h,v 1.4 1999/07/18 16:45:42 deraadt Exp $	*/
+/*	$OpenBSD: pmap.old.h,v 1.5 1999/07/18 18:00:03 deraadt Exp $	*/
 /*	$NetBSD: pmap.old.h,v 1.6 1996/11/13 21:13:19 cgd Exp $	*/
 
 /* 
@@ -123,6 +123,7 @@ extern	pt_entry_t *Sysmap;
 extern	char *vmmap;			/* map for mem, dumps, etc. */
 
 /* Machine-specific functions. */
+void	pmap_activate __P((pmap_t));
 void	pmap_emulate_reference __P((struct proc *, vm_offset_t, int, int));
 void	pmap_bootstrap __P((vm_offset_t, vm_offset_t));
 void	pmap_unmap_prom __P((void));
diff --git a/sys/arch/amiga/amiga/pmap.c b/sys/arch/amiga/amiga/pmap.c
index 7db5744c119..c7b817d5997 100644
--- a/sys/arch/amiga/amiga/pmap.c
+++ b/sys/arch/amiga/amiga/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.14 1999/07/18 16:45:43 deraadt Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.15 1999/07/18 18:00:03 deraadt Exp $	*/
 /*	$NetBSD: pmap.c,v 1.39 1997/06/10 18:26:41 veego Exp $	*/
 
 /* 
@@ -277,6 +277,7 @@ void		pmap_enter_ptpage __P((register pmap_t, register vm_offset_t));
 				pa < vm_last_phys)
 #endif
 
+void pmap_activate __P((register pmap_t, struct pcb *));
 extern vm_offset_t reserve_dumppages __P((vm_offset_t));
 static void amiga_protection_init __P((void));
 void pmap_check_wiring __P((char *, vm_offset_t));
@@ -1924,12 +1925,10 @@ ok:
 }
 
 void
-pmap_activate(p)
-	struct proc *p;
+pmap_activate(pmap, pcbp)
+	register pmap_t pmap;
+	struct pcb *pcbp;
 {
-	struct pcb *pcbp = &p->p_addr->u_pcb;
-	pmap_t pmap = p->p_vmspace->vm_map.pmap;
-
 #ifdef DEBUG
 	if (pmapdebug & (PDB_FOLLOW|PDB_SEGTAB))
 		printf("pmap_activate(%p, %p)\n", pmap, pcbp);
diff --git a/sys/arch/hp300/hp300/pmap.c b/sys/arch/hp300/hp300/pmap.c
index 9f8ad4fb0bd..d8ebdaf52ea 100644
--- a/sys/arch/hp300/hp300/pmap.c
+++ b/sys/arch/hp300/hp300/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.12 1999/07/18 16:45:47 deraadt Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.13 1999/07/18 18:00:04 deraadt Exp $	*/
 /*	$NetBSD: pmap.c,v 1.36 1997/06/10 18:52:23 veego Exp $	*/
 
 /* 
@@ -294,6 +294,8 @@ int		protostfree;	/* prototype (default) free ST map */
 struct pv_entry *pmap_alloc_pv __P((void));
 void	pmap_free_pv __P((struct pv_entry *));
 void	pmap_collect_pv __P((void));
+void	pmap_activate __P((pmap_t, struct pcb *));
+void	pmap_deactivate __P((pmap_t, struct pcb *));
 #ifdef COMPAT_HPUX
 int	pmap_mapmulti __P((pmap_t, vm_offset_t));
 #endif /* COMPAT_HPUX */
@@ -802,11 +804,10 @@ pmap_reference(pmap)
 }
 
 void
-pmap_activate(p)
-	struct proc *p;
+pmap_activate(pmap, pcb)
+	pmap_t pmap;
+	struct pcb *pcb;
 {
-	struct pcb *pcb = &p->p_addr->u_pcb;
-	pmap_t pmap = p->p_vmspace->vm_map.pmap;
 
 	if (pmap == NULL)
 		return;
@@ -820,8 +821,9 @@ pmap_activate(p)
 }
 
 void
-pmap_deactivate(p)
-	struct proc *p;
+pmap_deactivate(pmap, pcb)
+	pmap_t pmap;
+	struct pcb *pcb;
 {
 }
 
diff --git a/sys/arch/mac68k/mac68k/pmap.c b/sys/arch/mac68k/mac68k/pmap.c
index c76639c97ee..e9d4115849f 100644
--- a/sys/arch/mac68k/mac68k/pmap.c
+++ b/sys/arch/mac68k/mac68k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.14 1999/07/18 16:45:51 deraadt Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.15 1999/07/18 18:00:05 deraadt Exp $	*/
 /*	$NetBSD: pmap.c,v 1.28 1996/10/21 05:42:27 scottr Exp $	*/
 
 /* 
@@ -792,13 +792,13 @@ pmap_reference(pmap)
 }
 
 void	loadustp __P((vm_offset_t));
+void	pmap_activate __P((register pmap_t, struct pcb *));
 
 void
-pmap_activate(p)
-	struct proc *p;
+pmap_activate(pmap, pcbp)
+	register pmap_t pmap;
+	struct pcb *pcbp;
 {
-	struct pcb *pcbp = &p->p_addr->u_pcb;
-	pmap_t pmap = p->p_vmspace->vm_map.pmap;
 
 	if (pmap == NULL)
 		return;
@@ -811,9 +811,12 @@ pmap_activate(p)
 	PMAP_ACTIVATE(pmap, pcbp, pmap == curproc->p_vmspace->vm_map.pmap);
 }
 
+void	pmap_deactivate __P((register pmap_t, struct pcb *));
+
 void
-pmap_deactivate(p)
-	struct proc *p;
+pmap_deactivate(pmap, pcb)
+	register pmap_t pmap;
+	struct pcb *pcb;
 {
 }
 
diff --git a/sys/arch/mvme68k/mvme68k/pmap.c b/sys/arch/mvme68k/mvme68k/pmap.c
index c65e09843a7..402bc070647 100644
--- a/sys/arch/mvme68k/mvme68k/pmap.c
+++ b/sys/arch/mvme68k/mvme68k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.10 1999/07/18 16:45:52 deraadt Exp $ */
+/*	$OpenBSD: pmap.c,v 1.11 1999/07/18 18:00:06 deraadt Exp $ */
 
 /* 
  * Copyright (c) 1995 Theo de Raadt
@@ -909,11 +909,10 @@ pmap_reference(pmap)
 }
 
 void
-pmap_activate(p)
-	struct proc *p;
+pmap_activate(pmap, pcb)
+	register pmap_t pmap;
+	struct pcb *pcb;
 {
-	struct pcb *pcb = &p->p_addr->u_pcb;
-	pmap_t pmap = p->p_vmspace->vm_map.pmap;
 
 	if (pmap == NULL)
 		return;
@@ -927,8 +926,9 @@ pmap_activate(p)
 }
 
 void
-pmap_deactivate(p)
-	struct proc *p;
+pmap_deactivate(pmap, pcb)
+	register pmap_t pmap;
+	struct pcb *pcb;
 {
 }
 
diff --git a/sys/arch/mvme88k/include/pmap.h b/sys/arch/mvme88k/include/pmap.h
index 2be8bc8e6ff..960e75a0e9c 100644
--- a/sys/arch/mvme88k/include/pmap.h
+++ b/sys/arch/mvme88k/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.7 1999/07/18 16:45:54 deraadt Exp $ */
+/*	$OpenBSD: pmap.h,v 1.8 1999/07/18 18:00:06 deraadt Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1991 Carnegie Mellon University
@@ -91,6 +91,8 @@ extern	pmap_t	kernel_pmap;
 
 void _pmap_activate(pmap_t pmap, pcb_t, int my_cpu);
 void _pmap_deactivate(pmap_t pmap, pcb_t, int my_cpu);
+void pmap_activate(pmap_t my_pmap, pcb_t);
+void pmap_deactivate(pmap_t pmap, pcb_t);
 int pmap_check_transaction(pmap_t pmap, vm_offset_t va, vm_prot_t type);
 
 vm_offset_t pmap_map(
diff --git a/sys/arch/mvme88k/mvme88k/pmap.c b/sys/arch/mvme88k/mvme88k/pmap.c
index 86ad289b379..566174e23d5 100644
--- a/sys/arch/mvme88k/mvme88k/pmap.c
+++ b/sys/arch/mvme88k/mvme88k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.9 1999/07/18 16:45:55 deraadt Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.10 1999/07/18 18:00:07 deraadt Exp $	*/
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -3362,11 +3362,8 @@ pmap_collect(pmap_t pmap)
  *		cpu		CPU number
  */
 void
-pmap_activate(struct proc *p)
+pmap_activate(pmap_t pmap, pcb_t pcb)
 {
-	struct pcb *pcb = &p->p_addr->u_pcb;
-	pmap_t pmap = p->p_vmspace->vm_map.pmap;
-
 #ifdef	lint
 	my_cpu++;
 #endif
@@ -3388,11 +3385,8 @@ pmap_activate(struct proc *p)
  *		pcb		pointer to pcb
  */
 void
-pmap_deactivate(p)
+pmap_deactivate(pmap_t pmap, pcb_t pcb)
 {
-	struct pcb *pcb = &p->p_addr->u_pcb;
-	pmap_t pmap = p->p_vmspace->vm_map.pmap;
-
 #ifdef	lint
 	pmap++; th++; which_cpu++;
 #endif
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index b66116277fc..af0091c5556 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.9 1999/07/09 21:42:52 art Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.10 1999/07/18 18:00:08 deraadt Exp $	*/
 /*	$NetBSD: pmap.h,v 1.16 1996/03/31 22:15:32 pk Exp $	*/
 
 /* 
@@ -111,8 +111,6 @@ typedef struct pmap_statistics	*pmap_statistics_t;
 #ifdef _KERNEL
 __BEGIN_DECLS
 void		*pmap_bootstrap_alloc __P((int));
-void		pmap_activate __P((struct proc *));
-void		pmap_deactivate __P((struct proc *));
 #if 0
 /* Does not belong here! */
 void		 pmap_bootstrap( /* machine dependent */ );