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, 4 insertions, 24 deletions

diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h
index ef9f26ee2cb..2cf54275ecd 100644
--- a/sys/arch/sparc/include/pmap.h
+++ b/sys/arch/sparc/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.16 2000/06/05 11:02:52 art Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.17 2001/05/09 15:31:27 art Exp $	*/
 /*	$NetBSD: pmap.h,v 1.30 1997/08/04 20:00:47 pk Exp $ */
 
 /*
@@ -283,7 +283,7 @@ int		pmap_count_ptes __P((struct pmap *));
 void		pmap_prefer __P((vaddr_t, vaddr_t *));
 int		pmap_pa_exists __P((paddr_t));
 void		*pmap_bootstrap_alloc __P((int));
-void		pmap_change_wiring __P((pmap_t, vaddr_t, boolean_t));
+void		pmap_unwire __P((pmap_t, vaddr_t));
 void		pmap_collect __P((pmap_t));
 void		pmap_copy __P((pmap_t, pmap_t, vaddr_t, vsize_t, vaddr_t));
 #ifdef PMAP_NEW
@@ -294,7 +294,6 @@ pmap_t		pmap_create __P((vsize_t));
 void		pmap_destroy __P((pmap_t));
 void		pmap_init __P((void));
 vaddr_t		pmap_map __P((vaddr_t, paddr_t, paddr_t, int));
-void		pmap_pageable __P((pmap_t, paddr_t, paddr_t, boolean_t));
 vaddr_t		pmap_phys_address __P((int));
 void		pmap_pinit __P((pmap_t));
 void		pmap_reference __P((pmap_t));
diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c
index 54c782183fd..b736d752c68 100644
--- a/sys/arch/sparc/sparc/pmap.c
+++ b/sys/arch/sparc/sparc/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.80 2000/11/22 11:57:04 art Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.81 2001/05/09 15:31:27 art Exp $	*/
 /*	$NetBSD: pmap.c,v 1.118 1998/05/19 19:00:18 thorpej Exp $ */
 
 /*
@@ -5783,7 +5783,7 @@ pmap_kremove4m(va, len)
  */
 /* ARGSUSED */
 void
-pmap_change_wiring(pm, va, wired)
+pmap_unwire(pm, va, wired)
 	struct pmap *pm;
 	vaddr_t va;
 	int wired;
@@ -6274,25 +6274,6 @@ pmap_is_referenced4m(pa)
 #endif /* 4m */
 
 /*
- * Make the specified pages (by pmap, offset) pageable (or not) as requested.
- *
- * A page which is not pageable may not take a fault; therefore, its page
- * table entry must remain valid for the duration (or at least, the trap
- * handler must not call vm_fault).
- *
- * This routine is merely advisory; pmap_enter will specify that these pages
- * are to be wired down (or not) as appropriate.
- */
-/* ARGSUSED */
-void
-pmap_pageable(pm, start, end, pageable)
-	struct pmap *pm;
-	vaddr_t start, end;
-	int pageable;
-{
-}
-
-/*
  * Fill the given MI physical page with zero bytes.
  *
  * We avoid stomping on the cache.