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>

5 files changed, 16 insertions, 19 deletions

diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index bd188d3..e353284 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.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/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index bd188d3..e353284 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.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/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 519326a..b689fd4 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.221 1999/01/24 06:04:51 dillon Exp $
+ *	$Id: pmap.c,v 1.222 1999/01/28 01:59:50 dillon Exp $
  */
 
 /*
@@ -1553,12 +1553,12 @@ pmap_growkernel(vm_offset_t addr)
 
 		for (p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
 			if (p->p_vmspace) {
-				pmap = &p->p_vmspace->vm_pmap;
+				pmap = vmspace_pmap(p->p_vmspace);
 				*pmap_pde(pmap, kernel_vm_end) = newpdir;
 			}
 		}
 		if (aiovmspace != NULL) {
-			pmap = &aiovmspace->vm_pmap;
+			pmap = vmspace_pmap(aiovmspace);
 			*pmap_pde(pmap, kernel_vm_end) = newpdir;
 		}
 		*pmap_pde(kernel_pmap, kernel_vm_end) = newpdir;
@@ -1992,7 +1992,7 @@ pmap_remove_all(pa)
 				vm_page_dirty(ppv->pv_vm_page);
 		}
 		if (!update_needed &&
-			((!curproc || (&curproc->p_vmspace->vm_pmap == pv->pv_pmap)) ||
+			((!curproc || (vmspace_pmap(curproc->p_vmspace) == pv->pv_pmap)) ||
 			(pv->pv_pmap == kernel_pmap))) {
 			update_needed = 1;
 		}
@@ -2572,7 +2572,7 @@ pmap_prefault(pmap, addra, entry)
 	vm_page_t m, mpte;
 	vm_object_t object;
 
-	if (!curproc || (pmap != &curproc->p_vmspace->vm_pmap))
+	if (!curproc || (pmap != vmspace_pmap(curproc->p_vmspace)))
 		return;
 
 	object = entry->object.vm_object;
@@ -2975,7 +2975,7 @@ pmap_remove_pages(pmap, sva, eva)
 	int s;
 
 #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY
-	if (!curproc || (pmap != &curproc->p_vmspace->vm_pmap)) {
+	if (!curproc || (pmap != vmspace_pmap(curproc->p_vmspace))) {
 		printf("warning: pmap_remove_pages called with non-current pmap\n");
 		return;
 	}
@@ -3418,7 +3418,7 @@ pmap_activate(struct proc *p)
 	tlb_flush_count++;
 #endif
 	load_cr3(p->p_addr->u_pcb.pcb_cr3 =
-		vtophys(p->p_vmspace->vm_pmap.pm_pdir));
+		vtophys(vmspace_pmap(p->p_vmspace)->pm_pdir));
 }
 
 vm_offset_t
@@ -3446,7 +3446,7 @@ pmap_pid_dump(int pid) {
 		if (p->p_vmspace) {
 			int i,j;
 			index = 0;
-			pmap = &p->p_vmspace->vm_pmap;
+			pmap = vmspace_pmap(p->p_vmspace);
 			for(i=0;i<1024;i++) {
 				pd_entry_t *pde;
 				unsigned *pte;
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index a7a0b00..3ed436c 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.118 1999/02/08 02:42:12 dillon Exp $
+ *	$Id: vm_machdep.c,v 1.119 1999/02/16 10:49:48 dfr Exp $
  */
 
 #include "npx.h"
@@ -144,7 +144,7 @@ cpu_fork(p1, p2)
 	 * Set registers for trampoline to user mode.  Leave space for the
 	 * return address on stack.  These are the kernel mode register values.
 	 */
-	pcb2->pcb_cr3 = vtophys(p2->p_vmspace->vm_pmap.pm_pdir);
+	pcb2->pcb_cr3 = vtophys(vmspace_pmap(p2->p_vmspace)->pm_pdir);
 	pcb2->pcb_edi = p2->p_md.md_regs->tf_edi;
 	pcb2->pcb_esi = (int)fork_return;
 	pcb2->pcb_ebp = p2->p_md.md_regs->tf_ebp;
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index bd188d3..e353284 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -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;
         	}