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.151.2.1
retrieving revision 1.152
diff -u -p -r1.151.2.1 -r1.152
--- src/sys/kern/subr_pool.c	2008/03/24 07:16:14	1.151.2.1
+++ src/sys/kern/subr_pool.c	2008/03/02 12:19:58	1.152
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.151.2.1 2008/03/24 07:16:14 keiichi Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.152 2008/03/02 12:19:58 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2000, 2002, 2007 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.151.2.1 2008/03/24 07:16:14 keiichi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.152 2008/03/02 12:19:58 yamt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pool.h"
@@ -995,9 +995,8 @@ pool_get(struct pool *pp, int flags)
 
 #endif /* DIAGNOSTIC */
 #ifdef LOCKDEBUG
-	if (flags & PR_WAITOK) {
-		ASSERT_SLEEPABLE();
-	}
+	if (flags & PR_WAITOK)
+		ASSERT_SLEEPABLE(NULL, "pool_get(PR_WAITOK)");
 #endif
 
 	mutex_enter(&pp->pr_lock);
@@ -2522,9 +2521,8 @@ pool_cache_get_paddr(pool_cache_t pc, in
 	int s;
 
 #ifdef LOCKDEBUG
-	if (flags & PR_WAITOK) {
-		ASSERT_SLEEPABLE();
-	}
+	if (flags & PR_WAITOK)
+		ASSERT_SLEEPABLE(NULL, "pool_cache_get(PR_WAITOK)");
 #endif
 
 	cc = pool_cache_cpu_enter(pc, &s);
@@ -3064,7 +3062,7 @@ found:
 					snprintf(cpucachestr,
 					    sizeof(cpucachestr),
 					    "cached by CPU %u",
-					    ci->ci_index);
+					    (u_int)ci->ci_cpuid);
 					goto print;
 				}
 			}