Hide access to vmspace:vm_pmap with inline function vmspace_pmap(). This

is the preparation step for moving pmap storage out of vmspace proper.

Reviewed by:	Alan Cox	<alc@cs.rice.edu>
		Matthew Dillion	<dillon@apollo.backplane.com>

11 files changed, 24 insertions, 47 deletions

diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 570c364..02c3446 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact_aout.c,v 1.44 1999/01/01 14:41:51 bde Exp $
+ *	$Id: imgact_aout.c,v 1.45 1999/01/29 22:59:43 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -200,7 +200,7 @@ exec_aout_imgact(imgp)
 			return (error);
 	}
 
-	pmap_object_init_pt(&vmspace->vm_pmap, virtual_offset,
+	pmap_object_init_pt(vmspace_pmap(vmspace), virtual_offset,
 		object, (vm_pindex_t) OFF_TO_IDX(file_offset),
 		a_out->a_text + a_out->a_data, 0);
 
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 6d9586e..4e4478d 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: imgact_elf.c,v 1.52 1999/02/07 21:48:21 dillon Exp $
+ *	$Id: imgact_elf.c,v 1.53 1999/02/07 23:49:56 jdp Exp $
  */
 
 #include "opt_rlimit.h"
@@ -226,7 +226,7 @@ elf_load_section(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_o
 			return EINVAL;
 
 		/* prefault the page tables */
-		pmap_object_init_pt(&vmspace->vm_pmap,
+		pmap_object_init_pt(vmspace_pmap(vmspace),
 				    map_addr,
 				    object,
 				    (vm_pindex_t) OFF_TO_IDX(file_addr),
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 393d5b6..d8e5ef6 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.107 1999/01/30 19:36:02 msmith Exp $
+ * $Id: init_main.c,v 1.108 1999/02/17 21:03:14 luoqi Exp $
  */
 
 #include "opt_devfs.h"
@@ -443,12 +443,12 @@ proc0_init(dummy)
 
 
 	/* Allocate a prototype map so we have something to fork. */
-	pmap_pinit0(&vmspace0.vm_pmap);
+	pmap_pinit0(vmspace_pmap(&vmspace0));
 	p->p_vmspace = &vmspace0;
 	vmspace0.vm_refcnt = 1;
 	vm_map_init(&vmspace0.vm_map, round_page(VM_MIN_ADDRESS),
 	    trunc_page(VM_MAXUSER_ADDRESS));
-	vmspace0.vm_map.pmap = &vmspace0.vm_pmap;
+	vmspace0.vm_map.pmap = vmspace_pmap(&vmspace0);
 	p->p_addr = proc0paddr;				/* XXX */
 
 #ifndef __alpha__		/* XXX what is this? */
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 2ea378f..cda072a 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.85 1998/11/23 09:58:53 phk Exp $
+ * $Id: kern_clock.c,v 1.86 1998/11/29 20:31:02 phk Exp $
  */
 
 #include <sys/param.h>
@@ -472,8 +472,7 @@ statclock(frame)
 			ru->ru_ixrss += vm->vm_tsize * PAGE_SIZE / 1024;
 			ru->ru_idrss += vm->vm_dsize * PAGE_SIZE / 1024;
 			ru->ru_isrss += vm->vm_ssize * PAGE_SIZE / 1024;
-			rss = vm->vm_pmap.pm_stats.resident_count *
-			      PAGE_SIZE / 1024;
+			rss = vmspace_resident_count(vm) * PAGE_SIZE / 1024;
 			if (ru->ru_maxrss < rss)
 				ru->ru_maxrss = rss;
         	}
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index bb69fb6..f961a3a 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_exec.c,v 1.94 1999/01/27 21:49:55 dillon Exp $
+ *	$Id: kern_exec.c,v 1.95 1999/01/28 00:57:47 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -443,7 +443,7 @@ exec_new_vmspace(imgp)
 	if (vmspace->vm_refcnt == 1) {
 		if (vmspace->vm_shm)
 			shmexit(imgp->proc);
-		pmap_remove_pages(&vmspace->vm_pmap, 0, VM_MAXUSER_ADDRESS);
+		pmap_remove_pages(vmspace_pmap(vmspace), 0, VM_MAXUSER_ADDRESS);
 		vm_map_remove(map, 0, VM_MAXUSER_ADDRESS);
 	} else {
 		vmspace_exec(imgp->proc);
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 780f29d..c80b3c8 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.73 1999/01/30 06:25:00 newton Exp $
+ * $Id: kern_exit.c,v 1.74 1999/01/31 03:15:13 newton Exp $
  */
 
 #include "opt_compat.h"
@@ -217,7 +217,7 @@ exit1(p, rv)
 	if (vm->vm_refcnt == 1) {
 		if (vm->vm_shm)
 			shmexit(p);
-		pmap_remove_pages(&vm->vm_pmap, VM_MIN_ADDRESS,
+		pmap_remove_pages(vmspace_pmap(vm), VM_MIN_ADDRESS,
 		    VM_MAXUSER_ADDRESS);
 		(void) vm_map_remove(&vm->vm_map, VM_MIN_ADDRESS,
 		    VM_MAXUSER_ADDRESS);
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 1185662..bfb7df9 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
- * $Id: kern_proc.c,v 1.44 1999/01/26 02:38:10 julian Exp $
+ * $Id: kern_proc.c,v 1.45 1999/01/28 00:57:47 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -420,23 +420,8 @@ fill_eproc(p, ep)
 	}
 	if (p->p_stat != SIDL && p->p_stat != SZOMB && p->p_vmspace != NULL) {
 		register struct vmspace *vm = p->p_vmspace;
-
-#ifdef pmap_resident_count
-		ep->e_vm.vm_rssize = pmap_resident_count(&vm->vm_pmap); /*XXX*/
-#else
-		ep->e_vm.vm_rssize = vm->vm_rssize;
-#endif
-		ep->e_vm.vm_tsize = vm->vm_tsize;
-		ep->e_vm.vm_dsize = vm->vm_dsize;
-		ep->e_vm.vm_ssize = vm->vm_ssize;
-		ep->e_vm.vm_taddr = vm->vm_taddr;
-		ep->e_vm.vm_daddr = vm->vm_daddr;
-		ep->e_vm.vm_minsaddr = vm->vm_minsaddr;
-		ep->e_vm.vm_maxsaddr = vm->vm_maxsaddr;
-		ep->e_vm.vm_map = vm->vm_map;
-#ifndef sparc
-		ep->e_vm.vm_pmap = vm->vm_pmap;
-#endif
+		ep->e_vm = *vm;
+		ep->e_vm.vm_rssize = vmspace_resident_count(vm); /*XXX*/
 	}
 	if (p->p_pptr)
 		ep->e_ppid = p->p_pptr->p_pid;
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 2ea378f..cda072a 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.85 1998/11/23 09:58:53 phk Exp $
+ * $Id: kern_clock.c,v 1.86 1998/11/29 20:31:02 phk Exp $
  */
 
 #include <sys/param.h>
@@ -472,8 +472,7 @@ statclock(frame)
 			ru->ru_ixrss += vm->vm_tsize * PAGE_SIZE / 1024;
 			ru->ru_idrss += vm->vm_dsize * PAGE_SIZE / 1024;
 			ru->ru_isrss += vm->vm_ssize * PAGE_SIZE / 1024;
-			rss = vm->vm_pmap.pm_stats.resident_count *
-			      PAGE_SIZE / 1024;
+			rss = vmspace_resident_count(vm) * PAGE_SIZE / 1024;
 			if (ru->ru_maxrss < rss)
 				ru->ru_maxrss = rss;
         	}
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index bd188d3..e353284 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.88 1999/01/20 04:24:22 jkh Exp $
+ *	$Id: mp_machdep.c,v 1.89 1999/01/28 01:59:50 dillon Exp $
  */
 
 #include "opt_smp.h"
@@ -2390,8 +2390,7 @@ forwarded_statclock(int id, int pscnt, int *astmap)
 			ru->ru_ixrss += vm->vm_tsize * PAGE_SIZE / 1024;
 			ru->ru_idrss += vm->vm_dsize * PAGE_SIZE / 1024;
 			ru->ru_isrss += vm->vm_ssize * PAGE_SIZE / 1024;
-			rss = vm->vm_pmap.pm_stats.resident_count *
-				PAGE_SIZE / 1024;
+			rss = vmspace_resident_count(vm) * PAGE_SIZE / 1024;
 			if (ru->ru_maxrss < rss)
 				ru->ru_maxrss = rss;
         	}
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 592da5d..3b79a98 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.112 1999/01/28 17:32:00 dillon Exp $
+ * $Id: tty.c,v 1.113 1999/01/30 12:17:36 phk Exp $
  */
 
 /*-
@@ -2275,12 +2275,7 @@ ttyinfo(tp)
 		ttyprintf(tp, "%d%% %ldk\n",
 		    tmp / 100,
 		    pick->p_stat == SIDL || pick->p_stat == SZOMB ? 0 :
-#ifdef pmap_resident_count
-		    (long)pgtok(pmap_resident_count(&pick->p_vmspace->vm_pmap))
-#else
-		    (long)pgtok(pick->p_vmspace->vm_rssize)
-#endif
-		    );
+		    (long)pgtok(vmspace_resident_count(pick->p_vmspace)));
 	}
 	tp->t_rocount = 0;	/* so pending input will be retyped if BS */
 }
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 33cf33c..2598fd0 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $Id: vfs_aio.c,v 1.41 1999/01/29 08:29:04 bde Exp $
+ * $Id: vfs_aio.c,v 1.42 1999/01/29 23:18:49 dillon Exp $
  */
 
 /*
@@ -631,7 +631,7 @@ aio_daemon(const void *uproc)
 		 */
 		if (myvm->vm_shm)
 			shmexit(mycp);
-		pmap_remove_pages(&myvm->vm_pmap, 0, USRSTACK);
+		pmap_remove_pages(vmspace_pmap(myvm), 0, USRSTACK);
 		vm_map_remove(&myvm->vm_map, 0, USRSTACK);
 		myvm->vm_tsize = 0;
 		myvm->vm_dsize = 0;