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.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- src/sys/kern/subr_pool.c	2006/06/07 22:33:40	1.118
+++ src/sys/kern/subr_pool.c	2006/07/21 10:08:41	1.119
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.118 2006/06/07 22:33:40 kardel Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.119 2006/07/21 10:08:41 yamt 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.118 2006/06/07 22:33:40 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.119 2006/07/21 10:08:41 yamt Exp $");
 
 #include "opt_pool.h"
 #include "opt_poollog.h"
@@ -903,7 +903,7 @@ pool_get(struct pool *pp, int flags)
 #endif /* DIAGNOSTIC */
 #ifdef LOCKDEBUG
 	if (flags & PR_WAITOK)
-		simple_lock_only_held(NULL, "pool_get(PR_WAITOK)");
+		ASSERT_SLEEPABLE(NULL, "pool_get(PR_WAITOK)");
 	SCHED_ASSERT_UNLOCKED();
 #endif
 
@@ -2011,7 +2011,7 @@ pool_cache_get_paddr(struct pool_cache *
 
 #ifdef LOCKDEBUG
 	if (flags & PR_WAITOK)
-		simple_lock_only_held(NULL, "pool_cache_get(PR_WAITOK)");
+		ASSERT_SLEEPABLE(NULL, "pool_cache_get(PR_WAITOK)");
 #endif
 
 	simple_lock(&pc->pc_slock);