From 0abaa8b70dbfbbe9fd2d73adcc4527cd6c3dcf2c Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Thu, 7 Dec 2000 17:12:21 +0000
Subject: [PATCH] Nothing calls pmap_release() except for pmap_destroy(). 
 Merge the two.

---
 sys/arch/i386/i386/pmap.c | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c
index c17fdf6eee10..941c8668a63a 100644
--- a/sys/arch/i386/i386/pmap.c
+++ b/sys/arch/i386/i386/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.112 2000/12/07 17:09:26 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.113 2000/12/07 17:12:21 thorpej Exp $	*/
 
 /*
  *
@@ -428,8 +428,6 @@ static boolean_t	 pmap_try_steal_pv __P((struct pv_head *,
 						struct pv_entry *));
 static void		pmap_unmap_ptes __P((struct pmap *));
 
-void			pmap_release __P((pmap_t));
-
 /*
  * p m a p   i n l i n e   h e l p e r   f u n c t i o n s
  */
@@ -1784,6 +1782,7 @@ void
 pmap_destroy(pmap)
 	struct pmap *pmap;
 {
+	struct vm_page *pg;
 	int refs;
 
 	/*
@@ -1801,25 +1800,6 @@ pmap_destroy(pmap)
 	 * reference count is zero, free pmap resources and then free pmap.
 	 */
 
-	pmap_release(pmap);
-	pool_put(&pmap_pmap_pool, pmap);
-}
-
-/*
- * pmap_release: release all resources held by a pmap
- *
- * => if pmap is still referenced it should be locked
- * => XXX: we currently don't expect any busy PTPs because we don't
- *    allow anything to map them (except for the kernel's private
- *    recursive mapping) or make them busy.
- */
-
-void
-pmap_release(pmap)
-	struct pmap *pmap;
-{
-	struct vm_page *pg;
-
 	/*
 	 * remove it from global list of pmaps
 	 */
@@ -1860,6 +1840,8 @@ pmap_release(pmap)
 			    pmap->pm_ldt_len * sizeof(union descriptor));
 	}
 #endif
+
+	pool_put(&pmap_pmap_pool, pmap);
 }
 
 /*