[src/trunk]: src/sys/arch/i386/i386 Nothing calls pmap_release() except for p...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9411d5e89df2
branches:  trunk
changeset: 500183:9411d5e89df2
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Dec 07 17:12:21 2000 +0000

description:
Nothing calls pmap_release() except for pmap_destroy().  Merge the two.

diffstat:

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

diffs (61 lines):

diff -r b87c66e8d562 -r 9411d5e89df2 sys/arch/i386/i386/pmap.c
--- a/sys/arch/i386/i386/pmap.c Thu Dec 07 17:09:26 2000 +0000
+++ b/sys/arch/i386/i386/pmap.c Thu Dec 07 17:12:21 2000 +0000
@@ -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 @@
                                                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 @@
 pmap_destroy(pmap)
        struct pmap *pmap;
 {
+       struct vm_page *pg;
        int refs;
 
        /*
@@ -1801,25 +1800,6 @@
         * 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->pm_ldt_len * sizeof(union descriptor));
        }
 #endif
+
+       pool_put(&pmap_pmap_pool, pmap);
 }
 
 /*