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.182.4.4
retrieving revision 1.183
diff -u -p -r1.182.4.4 -r1.183
--- src/sys/kern/subr_pool.c	2011/04/21 01:42:09	1.182.4.4
+++ src/sys/kern/subr_pool.c	2010/04/25 11:49:04	1.183
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.182.4.4 2011/04/21 01:42:09 rmind Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.183 2010/04/25 11:49:04 ad Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.182.4.4 2011/04/21 01:42:09 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.183 2010/04/25 11:49:04 ad Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pool.h"
@@ -54,10 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_pool.c,
 #include <sys/cpu.h>
 #include <sys/atomic.h>
 
-#include <uvm/uvm_extern.h>
-#ifdef DIAGNOSTIC
-#include <uvm/uvm_km.h>	/* uvm_km_va_drain */
-#endif
+#include <uvm/uvm.h>
 
 /*
  * Pool resource management utility.
@@ -182,8 +179,6 @@ static struct pool pcg_large_pool;
 static struct pool cache_pool;
 static struct pool cache_cpu_pool;
 
-pool_cache_t pnbuf_cache;	/* pathname buffer cache */
-
 /* List of all caches. */
 TAILQ_HEAD(,pool_cache) pool_cache_head =
     TAILQ_HEAD_INITIALIZER(pool_cache_head);
@@ -567,11 +562,6 @@ pool_reclaim_register(struct pool *pp)
 	callback_register(&vm_map_to_kernel(map)->vmk_reclaim_callback,
 	    &pp->pr_reclaimerentry, pp, pool_reclaim_callback);
 	splx(s);
-
-#ifdef DIAGNOSTIC
-	/* Diagnostic drain attempt. */
-	uvm_km_va_drain(map, 0);
-#endif
 }
 
 static void
@@ -994,17 +984,19 @@ pool_get(struct pool *pp, int flags)
 	void *v;
 
 #ifdef DIAGNOSTIC
-	if (pp->pr_itemsperpage == 0)
-		panic("pool_get: pool '%s': pr_itemsperpage is zero, "
-		    "pool not initialized?", pp->pr_wchan);
-	if ((cpu_intr_p() || cpu_softintr_p()) && pp->pr_ipl == IPL_NONE &&
-	    !cold && panicstr == NULL)
-		panic("pool '%s' is IPL_NONE, but called from "
-		    "interrupt context\n", pp->pr_wchan);
-#endif
+	if (__predict_false(pp->pr_itemsperpage == 0))
+		panic("pool_get: pool %p: pr_itemsperpage is zero, "
+		    "pool not initialized?", pp);
+	if (__predict_false(curlwp == NULL && doing_shutdown == 0 &&
+			    (flags & PR_WAITOK) != 0))
+		panic("pool_get: %s: must have NOWAIT", pp->pr_wchan);
+
+#endif /* DIAGNOSTIC */
+#ifdef LOCKDEBUG
 	if (flags & PR_WAITOK) {
 		ASSERT_SLEEPABLE();
 	}
+#endif
 
 	mutex_enter(&pp->pr_lock);
 	pr_enter(pp, file, line);
@@ -1612,8 +1604,6 @@ pool_sethardlimit(struct pool *pp, int n
 
 /*
  * Release all complete pages that have not been used recently.
- *
- * Might be called from interrupt context.
  */
 int
 #ifdef POOL_DIAGNOSTIC
@@ -1628,10 +1618,6 @@ pool_reclaim(struct pool *pp)
 	bool klock;
 	int rv;
 
-	if (cpu_intr_p() || cpu_softintr_p()) {
-		KASSERT(pp->pr_ipl != IPL_NONE);
-	}
-
 	if (pp->pr_drain_hook != NULL) {
 		/*
 		 * The drain hook must be called with the pool unlocked.
@@ -1750,13 +1736,12 @@ pool_drain_start(struct pool **ppp, uint
 	}
 }
 
-bool
+void
 pool_drain_end(struct pool *pp, uint64_t where)
 {
-	bool reclaimed;
 
 	if (pp == NULL)
-		return false;
+		return;
 
 	KASSERT(pp->pr_refcnt > 0);
 
@@ -1765,15 +1750,13 @@ pool_drain_end(struct pool *pp, uint64_t
 		xc_wait(where);
 
 	/* Drain the cache (if any) and pool.. */
-	reclaimed = pool_reclaim(pp);
+	pool_reclaim(pp);
 
 	/* Finally, unlock the pool. */
 	mutex_enter(&pool_head_lock);
 	pp->pr_refcnt--;
 	cv_broadcast(&pool_busy);
 	mutex_exit(&pool_head_lock);
-
-	return reclaimed;
 }
 
 /*
@@ -2537,14 +2520,11 @@ pool_cache_get_paddr(pool_cache_t pc, in
 	void *object;
 	int s;
 
-	KASSERTMSG((!cpu_intr_p() && !cpu_softintr_p()) ||
-	    (pc->pc_pool.pr_ipl != IPL_NONE || cold || panicstr != NULL),
-	    ("pool '%s' is IPL_NONE, but called from interrupt context\n",
-	    pc->pc_pool.pr_wchan));
-
+#ifdef LOCKDEBUG
 	if (flags & PR_WAITOK) {
 		ASSERT_SLEEPABLE();
 	}
+#endif
 
 	/* Lock out interrupts and disable preemption. */
 	s = splvm();