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
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/subr_pool.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.60.2.1
retrieving revision 1.62
diff -u -p -r1.60.2.1 -r1.62
--- src/sys/kern/subr_pool.c	2002/01/10 20:00:01	1.60.2.1
+++ src/sys/kern/subr_pool.c	2001/10/07 12:44:06	1.62
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.60.2.1 2002/01/10 20:00:01 thorpej Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.62 2001/10/07 12:44:06 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2000 The NetBSD Foundation, Inc.
@@ -37,9 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.60.2.1 2002/01/10 20:00:01 thorpej Exp $");
-
 #include "opt_pool.h"
 #include "opt_poollog.h"
 #include "opt_lockdebug.h"
@@ -777,13 +774,9 @@ pool_get(struct pool *pp, int flags)
 		    pp->pr_wchan, pp->pr_nitems);
 		panic("pool_get: nitems inconsistent\n");
 	}
-#endif
 
-#ifdef POOL_DIAGNOSTIC
 	pr_log(pp, v, PRLOG_GET, file, line);
-#endif
 
-#ifdef DIAGNOSTIC
 	if (__predict_false(pi->pi_magic != PI_MAGIC)) {
 		pr_printlog(pp, pi, printf);
 		panic("pool_get(%s): free list modified: magic=%x; page %p;"
@@ -1421,8 +1414,9 @@ pool_drain(void *arg)
 		drainpp = TAILQ_NEXT(pp, pr_poollist);
 	}
 	simple_unlock(&pool_head_slock);
-	pool_reclaim(pp);
 	splx(s);
+
+	pool_reclaim(pp);
 }