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.151.2.1
retrieving revision 1.157
diff -u -p -r1.151.2.1 -r1.157
--- src/sys/kern/subr_pool.c	2008/03/24 07:16:14	1.151.2.1
+++ src/sys/kern/subr_pool.c	2008/04/24 11:38:36	1.157
@@ -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.157 2008/04/24 11:38:36 ad 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.157 2008/04/24 11:38:36 ad Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pool.h"
@@ -612,10 +612,10 @@ pool_subsystem_init(void)
 		pa_reclaim_register(pa);
 	}
 
-	pool_init(&cache_pool, sizeof(struct pool_cache), CACHE_LINE_SIZE,
+	pool_init(&cache_pool, sizeof(struct pool_cache), coherency_unit,
 	    0, 0, "pcache", &pool_allocator_nointr, IPL_NONE);
 
-	pool_init(&cache_cpu_pool, sizeof(pool_cache_cpu_t), CACHE_LINE_SIZE,
+	pool_init(&cache_cpu_pool, sizeof(pool_cache_cpu_t), coherency_unit,
 	    0, 0, "pcachecpu", &pool_allocator_nointr, IPL_NONE);
 }
 
@@ -814,14 +814,7 @@ pool_init(struct pool *pp, size_t size, 
 	pp->pr_entered_file = NULL;
 	pp->pr_entered_line = 0;
 
-	/*
-	 * XXXAD hack to prevent IP input processing from blocking.
-	 */
-	if (ipl == IPL_SOFTNET) {
-		mutex_init(&pp->pr_lock, MUTEX_DEFAULT, IPL_VM);
-	} else {
-		mutex_init(&pp->pr_lock, MUTEX_DEFAULT, ipl);
-	}
+	mutex_init(&pp->pr_lock, MUTEX_DEFAULT, ipl);
 	cv_init(&pp->pr_cv, wchan);
 	pp->pr_ipl = ipl;
 
@@ -855,12 +848,12 @@ pool_init(struct pool *pp, size_t size, 
 
 		size = sizeof(pcg_t) +
 		    (PCG_NOBJECTS_NORMAL - 1) * sizeof(pcgpair_t);
-		pool_init(&pcg_normal_pool, size, CACHE_LINE_SIZE, 0, 0,
+		pool_init(&pcg_normal_pool, size, coherency_unit, 0, 0,
 		    "pcgnormal", &pool_allocator_meta, IPL_VM);
 
 		size = sizeof(pcg_t) +
 		    (PCG_NOBJECTS_LARGE - 1) * sizeof(pcgpair_t);
-		pool_init(&pcg_large_pool, size, CACHE_LINE_SIZE, 0, 0,
+		pool_init(&pcg_large_pool, size, coherency_unit, 0, 0,
 		    "pcglarge", &pool_allocator_meta, IPL_VM);
 	}
 
@@ -1629,9 +1622,8 @@ pool_reclaim(struct pool *pp)
 	}
 
 	/*
-	 * XXXSMP Because mutexes at IPL_SOFTXXX are still spinlocks,
-	 * and we are called from the pagedaemon without kernel_lock.
-	 * Does not apply to IPL_SOFTBIO.
+	 * XXXSMP Because we do not want to cause non-MPSAFE code
+	 * to block.
 	 */
 	if (pp->pr_ipl == IPL_SOFTNET || pp->pr_ipl == IPL_SOFTCLOCK ||
 	    pp->pr_ipl == IPL_SOFTSERIAL) {
@@ -2074,15 +2066,7 @@ pool_cache_bootstrap(pool_cache_t pc, si
 	if (palloc == NULL && ipl == IPL_NONE)
 		palloc = &pool_allocator_nointr;
 	pool_init(pp, size, align, align_offset, flags, wchan, palloc, ipl);
-
-	/*
-	 * XXXAD hack to prevent IP input processing from blocking.
-	 */
-	if (ipl == IPL_SOFTNET) {
-		mutex_init(&pc->pc_lock, MUTEX_DEFAULT, IPL_VM);
-	} else {
-		mutex_init(&pc->pc_lock, MUTEX_DEFAULT, ipl);
-	}
+	mutex_init(&pc->pc_lock, MUTEX_DEFAULT, ipl);
 
 	if (ctor == NULL) {
 		ctor = (int (*)(void *, void *, int))nullop;
@@ -2206,7 +2190,6 @@ pool_cache_cpu_init1(struct cpu_info *ci
 	index = ci->ci_index;
 
 	KASSERT(index < MAXCPUS);
-	KASSERT(((uintptr_t)pc->pc_cpus & (CACHE_LINE_SIZE - 1)) == 0);
 
 	if ((cc = pc->pc_cpus[index]) != NULL) {
 		KASSERT(cc->cc_cpuindex == index);
@@ -2399,7 +2382,6 @@ pool_cache_cpu_enter(pool_cache_t pc, in
 	if (cc->cc_ipl != IPL_NONE) {
 		*s = splraiseipl(cc->cc_iplcookie);
 	}
-	KASSERT(((uintptr_t)cc & (CACHE_LINE_SIZE - 1)) == 0);
 
 	return cc;
 }