 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.h,v 1.55 2011/10/06 06:55:34 mrg Exp $	*/
+/*	$NetBSD: pmap.h,v 1.55.2.1 2011/12/02 16:33:09 yamt Exp $	*/
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
  * Copyright (C) 1995, 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -108,30 +108,28 @@ extern struct page_size_map page_size_ma
  */
 #define va_to_seg(v)	(int)((((paddr_t)(v))>>STSHIFT)&STMASK)
 #define va_to_dir(v)	(int)((((paddr_t)(v))>>PDSHIFT)&PDMASK)
 #define va_to_pte(v)	(int)((((paddr_t)(v))>>PTSHIFT)&PTMASK)
 #ifdef MULTIPROCESSOR
 #define PMAP_LIST_MAXNUMCPU	CPUSET_MAXNUMCPU
 #else
 #define PMAP_LIST_MAXNUMCPU	1
 #endif
 struct pmap {
-	struct uvm_object pm_obj;
+	unsigned int pm_refs;
-	kmutex_t pm_obj_lock;
+	TAILQ_HEAD(, vm_page) pm_ptps;
 #define pm_lock pm_obj.vmobjlock
 #define pm_refs pm_obj.uo_refs
 	LIST_ENTRY(pmap) pm_list[PMAP_LIST_MAXNUMCPU];	/* per cpu ctx used list */
 	struct pmap_statistics pm_stats;
 	/*
 	 * We record the context used on any cpu here. If the context
 	 * is actually present in the TLB, it will be the plain context
 	 * number. If the context is allocated, but has been flushed
 	 * from the tlb, the number will be negative.
 	 * If this pmap has no context allocated on that cpu, the entry
 	 * will be 0.
 	 */
 	int pm_ctx[PMAP_LIST_MAXNUMCPU];	/* Current context per cpu */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.275 2011/07/12 07:51:34 mrg Exp $	*/
+/*	$NetBSD: pmap.c,v 1.275.2.1 2011/12/02 16:33:09 yamt Exp $	*/
 /*
+ *
  * Copyright (C) 1996-1999 Eduardo Horvath.
  * All rights reserved.
+ *
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR  ``AS IS'' AND
 @@ -16,27 +16,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR  BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.275 2011/07/12 07:51:34 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.275.2.1 2011/12/02 16:33:09 yamt Exp $");
 #undef	NO_VCACHE /* Don't forget the locked TLB in dostart */
 #define	HWREF
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/msgbuf.h>
 #include <sys/pool.h>
 @@ -1369,30 +1369,28 @@ pmap_growkernel(vaddr_t maxkvaddr)
  * Create and return a physical map.
  */
 struct pmap *
 pmap_create(void)
+{
 	struct pmap *pm;
 	DPRINTF(PDB_CREATE, ("pmap_create()\n"));
 	pm = pool_cache_get(&pmap_cache, PR_WAITOK);
 	memset(pm, 0, sizeof *pm);
 	DPRINTF(PDB_CREATE, ("pmap_create(): created %p\n", pm));
-	mutex_init(&pm->pm_obj_lock, MUTEX_DEFAULT, IPL_NONE);
+	pm->pm_refs = 1;
-	uvm_obj_init(&pm->pm_obj, NULL, false, 1);
+	TAILQ_INIT(&pm->pm_ptps);
 	uvm_obj_setlock(&pm->pm_obj, &pm->pm_obj_lock);
 	if (pm != pmap_kernel()) {
 		while (!pmap_get_page(&pm->pm_physaddr)) {
 			uvm_wait("pmap_create");
+		}
 		pm->pm_segs = (paddr_t *)(u_long)pm->pm_physaddr;
+	}
 	DPRINTF(PDB_CREATE, ("pmap_create(%p): ctx %d\n", pm, pmap_ctx(pm)));
 	return pm;
+}
 /*
  * Add a reference to the given pmap.
  */
 @@ -1406,27 +1404,27 @@ pmap_reference(struct pmap *pm)
 /*
  * Retire the given pmap from service.
  * Should only be called if the map contains no valid mappings.
  */
 void
 pmap_destroy(struct pmap *pm)
+{
 #ifdef MULTIPROCESSOR
 	struct cpu_info *ci;
 	sparc64_cpuset_t pmap_cpus_active;
 #else
 #define pmap_cpus_active 0
 #endif
-	struct vm_page *pg, *nextpg;
+	struct vm_page *pg;
 	if ((int)atomic_dec_uint_nv(&pm->pm_refs) > 0) {
 		return;
+	}
 	DPRINTF(PDB_DESTROY, ("pmap_destroy: freeing pmap %p\n", pm));
 #ifdef MULTIPROCESSOR
 	CPUSET_CLEAR(pmap_cpus_active);
 	for (ci = cpus; ci != NULL; ci = ci->ci_next) {
 		/* XXXMRG: Move the lock inside one or both tests? */
 		mutex_enter(&ci->ci_ctx_lock);
 		if (CPUSET_HAS(cpus_active, ci->ci_index)) {
 			if (pm->pm_ctx[ci->ci_index] > 0) {
 				CPUSET_ADD(pmap_cpus_active, ci->ci_index);
 @@ -1434,42 +1432,38 @@ pmap_destroy(struct pmap *pm)
+			}
+		}
 		mutex_exit(&ci->ci_ctx_lock);
+	}
 #else
 	if (pmap_ctx(pm)) {
 		mutex_enter(&curcpu()->ci_ctx_lock);
 		ctx_free(pm, curcpu());
 		mutex_exit(&curcpu()->ci_ctx_lock);
+	}
 #endif
 	/* we could be a little smarter and leave pages zeroed */
-	for (pg = TAILQ_FIRST(&pm->pm_obj.memq); pg != NULL; pg = nextpg) {
+	while ((pg = TAILQ_FIRST(&pm->pm_ptps)) != NULL) {
 #ifdef DIAGNOSTIC
 		struct vm_page_md *md = VM_PAGE_TO_MD(pg);
 #endif
-		KASSERT((pg->flags & PG_MARKER) == 0);
+		TAILQ_REMOVE(&pm->pm_ptps, pg, pageq.queue);
 		nextpg = TAILQ_NEXT(pg, listq.queue);
 		TAILQ_REMOVE(&pm->pm_obj.memq, pg, listq.queue);
 		KASSERT(md->mdpg_pvh.pv_pmap == NULL);
 		dcache_flush_page_cpuset(VM_PAGE_TO_PHYS(pg), pmap_cpus_active);
 		uvm_pagefree(pg);
+	}
 	pmap_free_page((paddr_t)(u_long)pm->pm_segs, pmap_cpus_active);
 	uvm_obj_destroy(&pm->pm_obj, false);
 	mutex_destroy(&pm->pm_obj_lock);
 	pool_cache_put(&pmap_cache, pm);
+}
 /*
  * Copy the range specified by src_addr/len
  * from the source map to the range dst_addr/len
  * in the destination map.
+ *
  * This routine is only advisory and need not do anything.
  */
 void
 pmap_copy(struct pmap *dst_pmap, struct pmap *src_pmap, vaddr_t dst_addr, vsize_t len, vaddr_t src_addr)
+{
 @@ -1799,39 +1793,39 @@ pmap_enter(struct pmap *pm, vaddr_t va,
 	if (wired)
 		tte.data |= TLB_TSB_LOCK;
 	ptp = 0;
  retry:
 	i = pseg_set(pm, va, tte.data, ptp);
 	if (i & 4) {
 		/* ptp used as L3 */
 		KASSERT(ptp != 0);
 		KASSERT((i & 3) == 0);
 		ptpg = PHYS_TO_VM_PAGE(ptp);
 		if (ptpg) {
 			ptpg->offset = (uint64_t)va & (0xfffffLL << 23);
-			TAILQ_INSERT_TAIL(&pm->pm_obj.memq, ptpg, listq.queue);
+			TAILQ_INSERT_TAIL(&pm->pm_ptps, ptpg, pageq.queue);
 		} else {
 			KASSERT(pm == pmap_kernel());
+		}
+	}
 	if (i & 2) {
 		/* ptp used as L2 */
 		KASSERT(ptp != 0);
 		KASSERT((i & 4) == 0);
 		ptpg = PHYS_TO_VM_PAGE(ptp);
 		if (ptpg) {
 			ptpg->offset = (((uint64_t)va >> 43) & 0x3ffLL) << 13;
-			TAILQ_INSERT_TAIL(&pm->pm_obj.memq, ptpg, listq.queue);
+			TAILQ_INSERT_TAIL(&pm->pm_ptps, ptpg, pageq.queue);
 		} else {
 			KASSERT(pm == pmap_kernel());
+		}
+	}
 	if (i & 1) {
 		KASSERT((i & 4) == 0);
 		ptp = 0;
 		if (!pmap_get_page(&ptp)) {
 			mutex_exit(&pmap_lock);
 			if (flags & PMAP_CANFAIL) {
 				if (npv != NULL) {
 					/* free it */
 					npv->pv_next = freepv;