Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/kern/subr_pool.c,v retrieving revision 1.93 retrieving revision 1.93.2.1 diff -u -p -r1.93 -r1.93.2.1 --- src/sys/kern/subr_pool.c 2004/03/08 22:48:09 1.93 +++ src/sys/kern/subr_pool.c 2004/06/22 08:58:42 1.93.2.1 @@ -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 -__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 @@ pool_do_put(struct pool *pp, void *v) * 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 @@ pool_do_put(struct pool *pp, void *v) 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);