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.122.2.2
retrieving revision 1.126
diff -u -p -r1.122.2.2 -r1.126
--- src/sys/kern/subr_pool.c	2006/10/20 20:03:56	1.122.2.2
+++ src/sys/kern/subr_pool.c	2007/02/21 23:00:05	1.126
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.122.2.2 2006/10/20 20:03:56 ad Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.126 2007/02/21 23:00:05 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.122.2.2 2006/10/20 20:03:56 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.126 2007/02/21 23:00:05 thorpej Exp $");
 
 #include "opt_pool.h"
 #include "opt_poollog.h"
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_pool.c,
 #include <sys/lock.h>
 #include <sys/pool.h>
 #include <sys/syslog.h>
+#include <sys/debug.h>
 
 #include <uvm/uvm.h>
 
@@ -473,7 +474,7 @@ pr_rmpage(struct pool *pp, struct pool_i
 	pool_update_curpage(pp);
 }
 
-static boolean_t
+static bool
 pa_starved_p(struct pool_allocator *pa)
 {
 
@@ -674,6 +675,7 @@ pool_init(struct pool *pp, size_t size, 
 	pp->pr_hardlimit_warning_last.tv_usec = 0;
 	pp->pr_drain_hook = NULL;
 	pp->pr_drain_hook_arg = NULL;
+	pp->pr_freecheck = NULL;
 
 	/*
 	 * Decide whether to put the page header off page to avoid
@@ -1135,6 +1137,7 @@ pool_get(struct pool *pp, int flags)
 
 	simple_unlock(&pp->pr_slock);
 	KASSERT((((vaddr_t)v + pp->pr_itemoffset) & (pp->pr_align - 1)) == 0);
+	FREECHECK_OUT(&pp->pr_freecheck, v);
 	return (v);
 }
 
@@ -1148,6 +1151,7 @@ pool_do_put(struct pool *pp, void *v, st
 	struct pool_item_header *ph;
 
 	LOCK_ASSERT(simple_lock_held(&pp->pr_slock));
+	FREECHECK_IN(&pp->pr_freecheck, v);
 
 #ifdef DIAGNOSTIC
 	if (__predict_false(pp->pr_nout == 0)) {
@@ -2080,6 +2084,8 @@ pool_cache_get_paddr(struct pool_cache *
 			*pap = POOL_PADDR_INVALID;
 #endif
 		}
+
+		FREECHECK_OUT(&pc->pc_freecheck, object);
 		return (object);
 	}
 
@@ -2095,6 +2101,7 @@ pool_cache_get_paddr(struct pool_cache *
 
 	KASSERT((((vaddr_t)object + pc->pc_pool->pr_itemoffset) &
 	    (pc->pc_pool->pr_align - 1)) == 0);
+	FREECHECK_OUT(&pc->pc_freecheck, object);
 	return (object);
 }
 
@@ -2110,6 +2117,8 @@ pool_cache_put_paddr(struct pool_cache *
 	struct pool_cache_group *pcg;
 	int s;
 
+	FREECHECK_IN(&pc->pc_freecheck, object);
+
 	if (__predict_false((pc->pc_pool->pr_flags & PR_WANTED) != 0)) {
 		goto destruct;
 	}
@@ -2362,7 +2371,7 @@ pool_allocator_free(struct pool *pp, voi
 void *
 pool_page_alloc(struct pool *pp, int flags)
 {
-	boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
+	bool waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
 
 	return ((void *) uvm_km_alloc_poolpage_cache(kmem_map, waitok));
 }
@@ -2377,7 +2386,7 @@ pool_page_free(struct pool *pp, void *v)
 static void *
 pool_page_alloc_meta(struct pool *pp, int flags)
 {
-	boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
+	bool waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
 
 	return ((void *) uvm_km_alloc_poolpage(kmem_map, waitok));
 }
@@ -2429,7 +2438,7 @@ pool_subpage_free_nointr(struct pool *pp
 void *
 pool_page_alloc_nointr(struct pool *pp, int flags)
 {
-	boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
+	bool waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
 
 	return ((void *) uvm_km_alloc_poolpage_cache(kernel_map, waitok));
 }