More sync to NetBSD.

 - Change pmap_change_wiring to pmap_unwire because it's only called that way.
 - Remove pmap_pageable because it's seldom implemented and when it is, it's
   either almost useless or incorrect. The same information is already passed
   to the pmap anyway by pmap_enter and pmap_unwire.

2 files changed, 9 insertions, 17 deletions

diff --git a/sys/arch/hppa/hppa/pmap.c b/sys/arch/hppa/hppa/pmap.c
index 110489e8fdb..39df5f46d6f 100644
--- a/sys/arch/hppa/hppa/pmap.c
+++ b/sys/arch/hppa/hppa/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.43 2001/05/05 21:26:36 art Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.44 2001/05/09 15:31:24 art Exp $	*/
 
 /*
  * Copyright (c) 1998-2001 Michael Shalayeff
@@ -1261,7 +1261,7 @@ pmap_protect(pmap, sva, eva, prot)
 }
 
 /*
- *	Routine:	pmap_change_wiring
+ *	Routine:	pmap_unwire
  *	Function:	Change the wiring attribute for a map/virtual-address
  *			pair.
  *	In/out conditions:
@@ -1271,19 +1271,16 @@ pmap_protect(pmap, sva, eva, prot)
  * only used to unwire pages and hence the mapping entry will exist.
  */
 void
-pmap_change_wiring(pmap, va, wired)
-	register pmap_t	pmap;
+pmap_unwire(pmap, va)
+	pmap_t	pmap;
 	vaddr_t	va;
-	boolean_t	wired;
 {
-	register struct pv_entry *pv;
-	boolean_t waswired;
+	struct pv_entry *pv;
 
 	va = hppa_trunc_page(va);
 #ifdef PMAPDEBUG
 	if (pmapdebug & PDB_FOLLOW)
-		printf("pmap_change_wiring(%p, %x, %swire)\n",
-		    pmap, va, wired? "": "un");
+		printf("pmap_unwire(%p, %x)\n", pmap, va);
 #endif
 
 	if (!pmap)
@@ -1292,13 +1289,9 @@ pmap_change_wiring(pmap, va, wired)
 	simple_lock(&pmap->pmap_lock);
 
 	if ((pv = pmap_find_va(pmap_sid(pmap, va), va)) == NULL)
-		panic("pmap_change_wiring: can't find mapping entry");
+		panic("pmap_unwire: can't find mapping entry");
 
-	waswired = pv->pv_tlbprot & TLB_WIRED;
-	if (wired && !waswired) {
-		pv->pv_tlbprot |= TLB_WIRED;
-		pmap->pmap_stats.wired_count++;
-	} else if (!wired && waswired) {
+	if (pv->pv_tlbprot & TLB_WIRED) {
 		pv->pv_tlbprot &= ~TLB_WIRED;
 		pmap->pmap_stats.wired_count--;
 	}
diff --git a/sys/arch/hppa/include/pmap.h b/sys/arch/hppa/include/pmap.h
index f586f4785c9..d8a11ebbaed 100644
--- a/sys/arch/hppa/include/pmap.h
+++ b/sys/arch/hppa/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.13 2001/01/12 23:37:01 mickey Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.14 2001/05/09 15:31:24 art Exp $	*/
 
 /*
  * Copyright (c) 1998,1999 Michael Shalayeff
@@ -182,7 +182,6 @@ do { if (pmap) { \
 } } while (0)
 #define pmap_collect(pmap)
 #define pmap_release(pmap)
-#define pmap_pageable(pmap, start, end, pageable)
 #define pmap_copy(dpmap,spmap,da,len,sa)
 #define	pmap_update()
 #define	pmap_activate(p)