[src/netbsd-2-0]: src/sys/kern Pull up revision 1.96 (requested by thorpej in...

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

details:   https://anonhg.NetBSD.org/src/rev/3ecbc788c19d
branches:  netbsd-2-0
changeset: 561575:3ecbc788c19d
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 22 08:58:42 2004 +0000

description:
Pull up revision 1.96 (requested by thorpej in ticket #522):
Remove PR_IMMEDRELEASE, since setting the high water mark will achieve
the same thing.
Pointed out back in January by YAMAMOTO Takashi.

diffstat:

 sys/kern/subr_pool.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 7f5b51202437 -r 3ecbc788c19d sys/kern/subr_pool.c
--- a/sys/kern/subr_pool.c      Tue Jun 22 08:56:51 2004 +0000
+++ b/sys/kern/subr_pool.c      Tue Jun 22 08:58:42 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_pool.c,v 1.93 2004/03/08 22:48:09 dbj Exp $       */
+/*     $NetBSD: subr_pool.c,v 1.93.2.1 2004/06/22 08:58:42 tron Exp $  */
 
 /*-
  * Copyright (c) 1997, 1999, 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.93 2004/03/08 22:48:09 dbj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.93.2.1 2004/06/22 08:58:42 tron Exp $");
 
 #include "opt_pool.h"
 #include "opt_poollog.h"
@@ -957,8 +957,7 @@
         * If this page is now empty, do one of two things:
         *
         *      (1) If we have more pages than the page high water mark,
-        *          or if we are flagged as immediately freeing back idle
-        *          pages, free the page back to the system.  ONLY CONSIDER
+        *          free the page back to the system.  ONLY CONSIDER
         *          FREEING BACK A PAGE IF WE HAVE MORE THAN OUR MINIMUM PAGE
         *          CLAIM.
         *
@@ -971,7 +970,6 @@
                pp->pr_nidle++;
                if (pp->pr_npages > pp->pr_minpages &&
                    (pp->pr_npages > pp->pr_maxpages ||
-                    (pp->pr_roflags & PR_IMMEDRELEASE) != 0 ||
                     (pp->pr_alloc->pa_flags & PA_WANT) != 0)) {
                        simple_unlock(&pp->pr_slock);
                        pr_rmpage(pp, ph, NULL);