 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.211.2.6 2010/02/10 15:37:48 uebayasi Exp $	*/
+/*	$NetBSD: pmap.c,v 1.211.2.7 2010/02/10 15:48:28 uebayasi Exp $	*/
 /*
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford for Wasabi Systems, Inc.
+ *
  * 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
 @@ -201,27 +201,27 @@
 #include <sys/pool.h>
 #include <sys/cdefs.h>
 #include <sys/cpu.h>
 #include <sys/sysctl.h>
 #include <uvm/uvm.h>
 #include <machine/bus.h>
 #include <machine/pmap.h>
 #include <machine/pcb.h>
 #include <machine/param.h>
 #include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.6 2010/02/10 15:37:48 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.7 2010/02/10 15:48:28 uebayasi Exp $");
 #ifdef PMAP_DEBUG
 /* XXX need to get rid of all refs to this */
 int pmap_debug_level = 0;
 /*
  * for switching to potentially finer grained debugging
  */
 #define	PDB_FOLLOW	0x0001
 #define	PDB_INIT	0x0002
 #define	PDB_ENTER	0x0004
 #define	PDB_REMOVE	0x0008
 @@ -2559,36 +2559,37 @@ pmap_flush_page(struct vm_page_md *md, p
 #endif /* PMAP_CACHE_VIPT */
 /*
  * Routine:	pmap_page_remove
  * Function:
  *		Removes this physical page from
  *		all physical maps in which it resides.
  *		Reflects back modify bits to the pager.
  */
 static void
 pmap_page_remove(struct vm_page *pg)
+{
 	struct vm_page_md *md = VM_PAGE_TO_MD(pg);
 	paddr_t pa = VM_PAGE_TO_PHYS(pg);
 	struct l2_bucket *l2b;
 	struct pv_entry *pv, *npv, **pvp;
 	pmap_t pm;
 	pt_entry_t *ptep;
 	bool flush;
 	u_int flags;
 	NPDEBUG(PDB_FOLLOW,
 	    printf("pmap_page_remove: pg %p (0x%08lx)\n", pg,
-	    VM_PAGE_TO_PHYS(pg)));
+	    pa));
 	PMAP_HEAD_TO_MAP_LOCK();
 	simple_lock(&md->pvh_slock);
 	pv = SLIST_FIRST(&md->pvh_list);
 	if (pv == NULL) {
 #ifdef PMAP_CACHE_VIPT
 		/*
 		 * We *know* the page contents are about to be replaced.
 		 * Discard the exec contents
 		 */
 		if (PV_IS_EXEC_P(md->pvh_attrs))
 			PMAPCOUNT(exec_discarded_page_protect);
 @@ -2671,27 +2672,27 @@ pmap_page_remove(struct vm_page *pg)
 		*ptep = 0;
 		PTE_SYNC_CURRENT(pm, ptep);
 		pmap_free_l2_bucket(pm, l2b, 1);
 		pool_put(&pmap_pv_pool, pv);
 		pv = npv;
 		/*
 		 * if we reach the end of the list and there are still
 		 * mappings, they might be able to be cached now.
 		 */
 		if (pv == NULL) {
 			*pvp = NULL;
 			if (!SLIST_EMPTY(&md->pvh_list))
-				pmap_vac_me_harder(md, VM_PAGE_TO_PHYS(pg), pm, 0);
+				pmap_vac_me_harder(md, pa, pm, 0);
+		}
 		pmap_release_pmap_lock(pm);
+	}
 #ifdef PMAP_CACHE_VIPT
 	/*
 	 * Its EXEC cache is now gone.
 	 */
 	if (PV_IS_EXEC_P(md->pvh_attrs))
 		PMAPCOUNT(exec_discarded_page_protect);
 	md->pvh_attrs &= ~PVF_EXEC;
 	KASSERT(md->urw_mappings == 0);
 	KASSERT(md->uro_mappings == 0);
 	if (md->krw_mappings == 0)
 @@ -3461,28 +3462,28 @@ pmap_kremove(vaddr_t va, vsize_t len)
 		next_bucket = L2_NEXT_BUCKET(va);
 		if (next_bucket > eva)
 			next_bucket = eva;
 		l2b = pmap_get_l2_bucket(pmap_kernel(), va);
 		KDASSERT(l2b != NULL);
 		sptep = ptep = &l2b->l2b_kva[l2pte_index(va)];
 		mappings = 0;
 		while (va < next_bucket) {
 			opte = *ptep;
 			opg = PHYS_TO_VM_PAGE(l2pte_pa(opte));
 			struct vm_page_md *omd = VM_PAGE_TO_MD(opg);
 			if (opg) {
 				struct vm_page_md *omd = VM_PAGE_TO_MD(opg);
 				if (omd->pvh_attrs & PVF_KMPAGE) {
 					simple_lock(&omd->pvh_slock);
 					KASSERT(omd->urw_mappings == 0);
 					KASSERT(omd->uro_mappings == 0);
 					KASSERT(omd->krw_mappings == 0);
 					KASSERT(omd->kro_mappings == 0);
 					omd->pvh_attrs &= ~PVF_KMPAGE;
 #ifdef PMAP_CACHE_VIPT
 					omd->pvh_attrs &= ~PVF_WRITE;
 #endif
 					pmap_kmpages--;
 					simple_unlock(&omd->pvh_slock);
 #ifdef PMAP_CACHE_VIPT
 @@ -3630,28 +3631,28 @@ pmap_protect(pmap_t pm, vaddr_t sva, vad
 				 * OK, at this point, we know we're doing
 				 * write-protect operation.  If the pmap is
 				 * active, write-back the page.
 				 */
 				pmap_dcache_wb_range(pm, sva, PAGE_SIZE,
 				    false, false);
 #endif
 				pg = PHYS_TO_VM_PAGE(l2pte_pa(pte));
 				pte &= ~L2_S_PROT_W;
 				*ptep = pte;
 				PTE_SYNC(ptep);
 				struct vm_page_md *md = VM_PAGE_TO_MD(pg);
 				if (pg != NULL) {
 					struct vm_page_md *md = VM_PAGE_TO_MD(pg);
 					simple_lock(&md->pvh_slock);
 					f = pmap_modify_pv(md, VM_PAGE_TO_PHYS(pg), pm, sva,
 					    clr_mask, 0);
 					pmap_vac_me_harder(md, VM_PAGE_TO_PHYS(pg), pm, sva);
 					simple_unlock(&md->pvh_slock);
 				} else
 					f = PVF_REF | PVF_EXEC;
 				if (flush >= 0) {
 					flush++;
 					flags |= f;
 				} else
 				if (PV_BEEN_EXECD(f))