Index: src/sys/arch/acorn26/acorn26/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/acorn26/acorn26/pmap.c,v
retrieving revision 1.10
diff -u -u -p -r1.10 pmap.c
--- src/sys/arch/acorn26/acorn26/pmap.c	26 Oct 2003 13:17:50 -0000	1.10
+++ src/sys/arch/acorn26/acorn26/pmap.c	9 Mar 2004 18:56:52 -0000
@@ -361,7 +361,7 @@ pmap_init2()
 
 	/* Create pmap pool */
 	pool_init(&pmap_pool, sizeof(struct pmap), 0, 0, 0,
-	    "pmappool", NULL);
+	    "pmappool", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pmap_initialised = 1;
 }
 
Index: src/sys/arch/alpha/alpha/interrupt.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/interrupt.c,v
retrieving revision 1.66
diff -u -u -p -r1.66 interrupt.c
--- src/sys/arch/alpha/alpha/interrupt.c	5 Feb 2003 12:16:42 -0000	1.66
+++ src/sys/arch/alpha/alpha/interrupt.c	9 Mar 2004 18:56:54 -0000
@@ -540,7 +540,7 @@ softintr_init()
 	for (i = 0; i < IPL_NSOFT; i++) {
 		asi = &alpha_soft_intrs[i];
 		TAILQ_INIT(&asi->softintr_q);
-		simple_lock_init(&asi->softintr_slock);
+		simple_lock_init(&asi->softintr_slock, IPL_NONE/*XXXUNVERIFIED*/);
 		asi->softintr_ipl = i;
 		evcnt_attach_dynamic(&asi->softintr_evcnt, EVCNT_TYPE_INTR,
 		    NULL, "soft", softintr_names[i]);
Index: src/sys/arch/alpha/alpha/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/machdep.c,v
retrieving revision 1.281
diff -u -u -p -r1.281 machdep.c
--- src/sys/arch/alpha/alpha/machdep.c	14 Feb 2004 14:33:28 -0000	1.281
+++ src/sys/arch/alpha/alpha/machdep.c	9 Mar 2004 18:56:55 -0000
@@ -670,7 +670,7 @@ nobootinfo:
 	    (u_int64_t)proc0paddr + USPACE - sizeof(struct trapframe);
 	lwp0.l_md.md_tf =
 	    (struct trapframe *)proc0paddr->u_pcb.pcb_hw.apcb_ksp;
-	simple_lock_init(&proc0paddr->u_pcb.pcb_fpcpu_slock);
+	simple_lock_init(&proc0paddr->u_pcb.pcb_fpcpu_slock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	/*
 	 * Initialize the primary CPU's idle PCB to proc0's.  In a
Index: src/sys/arch/alpha/alpha/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/pmap.c,v
retrieving revision 1.207
diff -u -u -p -r1.207 pmap.c
--- src/sys/arch/alpha/alpha/pmap.c	13 Jan 2004 18:50:40 -0000	1.207
+++ src/sys/arch/alpha/alpha/pmap.c	9 Mar 2004 18:56:58 -0000
@@ -922,7 +922,7 @@ pmap_bootstrap(paddr_t ptaddr, u_int max
 	}
 
 	/* Initialize the pmap_growkernel_slock. */
-	simple_lock_init(&pmap_growkernel_slock);
+	simple_lock_init(&pmap_growkernel_slock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	/*
 	 * Set up level three page table (lev3map)
@@ -935,13 +935,13 @@ pmap_bootstrap(paddr_t ptaddr, u_int max
 	pmap_ncpuids = ncpuids;
 	pool_init(&pmap_pmap_pool,
 	    PMAP_SIZEOF(pmap_ncpuids), 0, 0, 0, "pmappl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 	pool_init(&pmap_l1pt_pool, PAGE_SIZE, 0, 0, 0, "l1ptpl",
-	    &pmap_l1pt_allocator);
+	    &pmap_l1pt_allocator, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_cache_init(&pmap_l1pt_cache, &pmap_l1pt_pool, pmap_l1pt_ctor,
 	    NULL, NULL);
 	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvpl",
-	    &pmap_pv_page_allocator);
+	    &pmap_pv_page_allocator, IPL_NONE/*XXXUNVERIFIED*/);
 
 	TAILQ_INIT(&pmap_all_pmaps);
 
@@ -958,7 +958,7 @@ pmap_bootstrap(paddr_t ptaddr, u_int max
 	 * Initialize the locks.
 	 */
 	spinlockinit(&pmap_main_lock, "pmaplk", 0);
-	simple_lock_init(&pmap_all_pmaps_slock);
+	simple_lock_init(&pmap_all_pmaps_slock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	/*
 	 * Initialize kernel pmap.  Note that all kernel mappings
@@ -975,7 +975,7 @@ pmap_bootstrap(paddr_t ptaddr, u_int max
 		pmap_kernel()->pm_asni[i].pma_asngen =
 		    pmap_asn_info[i].pma_asngen;
 	}
-	simple_lock_init(&pmap_kernel()->pm_slock);
+	simple_lock_init(&pmap_kernel()->pm_slock, IPL_NONE/*XXXUNVERIFIED*/);
 	TAILQ_INSERT_TAIL(&pmap_all_pmaps, pmap_kernel(), pm_list);
 
 #if defined(MULTIPROCESSOR)
@@ -983,10 +983,10 @@ pmap_bootstrap(paddr_t ptaddr, u_int max
 	 * Initialize the TLB shootdown queues.
 	 */
 	pool_init(&pmap_tlb_shootdown_job_pool,
-	    sizeof(struct pmap_tlb_shootdown_job), 0, 0, 0, "pmaptlbpl", NULL);
+	    sizeof(struct pmap_tlb_shootdown_job), 0, 0, 0, "pmaptlbpl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	for (i = 0; i < ALPHA_MAXPROCS; i++) {
 		TAILQ_INIT(&pmap_tlb_shootdown_q[i].pq_head);
-		simple_lock_init(&pmap_tlb_shootdown_q[i].pq_slock);
+		simple_lock_init(&pmap_tlb_shootdown_q[i].pq_slock, IPL_NONE/*XXXUNVERIFIED*/);
 	}
 #endif
 
@@ -1201,7 +1201,7 @@ pmap_create(void)
 		/* XXX Locking? */
 		pmap->pm_asni[i].pma_asngen = pmap_asn_info[i].pma_asngen;
 	}
-	simple_lock_init(&pmap->pm_slock);
+	simple_lock_init(&pmap->pm_slock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	simple_lock(&pmap_all_pmaps_slock);
 	TAILQ_INSERT_TAIL(&pmap_all_pmaps, pmap, pm_list);
Index: src/sys/arch/alpha/alpha/prom.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/prom.c,v
retrieving revision 1.44
diff -u -u -p -r1.44 prom.c
--- src/sys/arch/alpha/alpha/prom.c	8 Mar 2003 01:18:42 -0000	1.44
+++ src/sys/arch/alpha/alpha/prom.c	9 Mar 2004 18:56:59 -0000
@@ -87,7 +87,7 @@ init_prom_interface(struct rpb *rpb)
         prom_dispatch_v.routine_arg = c->crb_v_dispatch;
         prom_dispatch_v.routine = c->crb_v_dispatch->entry_va;
 
-	simple_lock_init(&prom_slock);
+	simple_lock_init(&prom_slock, IPL_NONE/*XXXUNVERIFIED*/);
 }
 
 void
Index: src/sys/arch/alpha/alpha/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/vm_machdep.c,v
retrieving revision 1.82
diff -u -u -p -r1.82 vm_machdep.c
--- src/sys/arch/alpha/alpha/vm_machdep.c	5 Jan 2004 23:51:19 -0000	1.82
+++ src/sys/arch/alpha/alpha/vm_machdep.c	9 Mar 2004 18:56:59 -0000
@@ -167,7 +167,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp 
 		l2->l_addr->u_pcb.pcb_hw.apcb_usp = (u_long)stack + stacksize;
 	else
 		l2->l_addr->u_pcb.pcb_hw.apcb_usp = alpha_pal_rdusp();
-	simple_lock_init(&l2->l_addr->u_pcb.pcb_fpcpu_slock);
+	simple_lock_init(&l2->l_addr->u_pcb.pcb_fpcpu_slock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	/*
 	 * Arrange for a non-local goto when the new process
Index: src/sys/arch/alpha/include/vmparam.h
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/include/vmparam.h,v
retrieving revision 1.27
diff -u -u -p -r1.27 vmparam.h
--- src/sys/arch/alpha/include/vmparam.h	7 Aug 2003 16:26:33 -0000	1.27
+++ src/sys/arch/alpha/include/vmparam.h	9 Mar 2004 18:57:00 -0000
@@ -173,7 +173,7 @@ struct vm_page_md {
 #define	VM_MDPAGE_INIT(pg)						\
 do {									\
 	(pg)->mdpage.pvh_list = NULL;					\
-	simple_lock_init(&(pg)->mdpage.pvh_slock);			\
+	simple_lock_init(&(pg)->mdpage.pvh_slock, IPL_NONE/*XXXUNVERIFIED*/);			\
 } while (/*CONSTCOND*/0)
 
 #endif	/* ! _ALPHA_VMPARAM_H_ */
Index: src/sys/arch/alpha/pci/ttwoga_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/ttwoga_pci.c,v
retrieving revision 1.2
diff -u -u -p -r1.2 ttwoga_pci.c
--- src/sys/arch/alpha/pci/ttwoga_pci.c	15 May 2002 16:57:43 -0000	1.2
+++ src/sys/arch/alpha/pci/ttwoga_pci.c	9 Mar 2004 18:57:00 -0000
@@ -94,7 +94,7 @@ void
 ttwoga_pci_init(pci_chipset_tag_t pc, void *v)
 {
 
-	simple_lock_init(&ttwoga_conf_slock);
+	simple_lock_init(&ttwoga_conf_slock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	pc->pc_conf_v = v;
 	pc->pc_attach_hook = ttwoga_attach_hook;
Index: src/sys/arch/amd64/amd64/cpu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/amd64/cpu.c,v
retrieving revision 1.4
diff -u -u -p -r1.4 cpu.c
--- src/sys/arch/amd64/amd64/cpu.c	19 Feb 2004 17:18:38 -0000	1.4
+++ src/sys/arch/amd64/amd64/cpu.c	9 Mar 2004 18:57:01 -0000
@@ -281,7 +281,7 @@ cpu_attach(parent, self, aux)
 #endif
 	ci->ci_func = caa->cpu_func;
 
-	simple_lock_init(&ci->ci_slock);
+	simple_lock_init(&ci->ci_slock, IPL_NONE/*XXXUNVERIFIED*/);
 
 #if defined(MULTIPROCESSOR)
 	/*
Index: src/sys/arch/amd64/amd64/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/amd64/machdep.c,v
retrieving revision 1.21
diff -u -u -p -r1.21 machdep.c
--- src/sys/arch/amd64/amd64/machdep.c	1 Mar 2004 12:06:02 -0000	1.21
+++ src/sys/arch/amd64/amd64/machdep.c	9 Mar 2004 18:57:02 -0000
@@ -934,7 +934,7 @@ setregs(l, pack, stack)
 
 struct gate_descriptor *idt;
 char idt_allocmap[NIDT];
-struct simplelock idt_lock = SIMPLELOCK_INITIALIZER;
+struct simplelock idt_lock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 char *ldtstore;
 char *gdtstore;
 extern  struct user *proc0paddr;
Index: src/sys/arch/amd64/amd64/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/amd64/pmap.c,v
retrieving revision 1.9
diff -u -u -p -r1.9 pmap.c
--- src/sys/arch/amd64/amd64/pmap.c	19 Feb 2004 17:18:38 -0000	1.9
+++ src/sys/arch/amd64/amd64/pmap.c	9 Mar 2004 18:57:05 -0000
@@ -938,7 +938,7 @@ pmap_bootstrap(kva_start)
 
 	kpm = pmap_kernel();
 	for (i = 0; i < PTP_LEVELS - 1; i++) {
-		simple_lock_init(&kpm->pm_obj[i].vmobjlock);
+		simple_lock_init(&kpm->pm_obj[i].vmobjlock, IPL_NONE/*XXXUNVERIFIED*/);
 		kpm->pm_obj[i].pgops = NULL;
 		TAILQ_INIT(&kpm->pm_obj[i].memq);
 		kpm->pm_obj[i].uo_npages = 0;
@@ -1124,8 +1124,8 @@ pmap_bootstrap(kva_start)
 #if defined(MULTIPROCESSOR) || defined(LOCKDEBUG)
 	spinlockinit(&pmap_main_lock, "pmaplk", 0);
 #endif
-	simple_lock_init(&pvalloc_lock);
-	simple_lock_init(&pmaps_lock);
+	simple_lock_init(&pvalloc_lock, IPL_NONE/*XXXUNVERIFIED*/);
+	simple_lock_init(&pmaps_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	LIST_INIT(&pmaps);
 	TAILQ_INIT(&pv_freepages);
 	TAILQ_INIT(&pv_unusedpgs);
@@ -1135,7 +1135,7 @@ pmap_bootstrap(kva_start)
 	 */
 
 	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-		  &pool_allocator_nointr);
+		  &pool_allocator_nointr, IPL_NONE);
 
 	/*
 	 * Initialize the TLB shootdown queues.
@@ -1153,7 +1153,7 @@ pmap_bootstrap(kva_start)
 	 */
 
 	pool_init(&pmap_pdp_pool, PAGE_SIZE, 0, 0, 0, "pdppl",
-		  &pool_allocator_nointr);
+		  &pool_allocator_nointr, IPL_NONE);
 	pool_cache_init(&pmap_pdp_cache, &pmap_pdp_pool,
 			pmap_pdp_ctor, NULL, NULL);
 
@@ -1231,7 +1231,7 @@ pmap_init()
 		for (i = 0;
 		     i < (vm_physmem[lcv].end - vm_physmem[lcv].start); i++) {
 			simple_lock_init(
-			    &vm_physmem[lcv].pmseg.pvhead[i].pvh_lock);
+			    &vm_physmem[lcv].pmseg.pvhead[i].pvh_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		}
 	}
 
@@ -1256,7 +1256,7 @@ pmap_init()
 		pmsegp = &vm_physmem[lcv].pmseg;
 
 		for (off = 0; off <npages; off++)
-			simple_lock_init(&pmsegp->pvhead[off].pvh_lock);
+			simple_lock_init(&pmsegp->pvhead[off].pvh_lock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	}
 #endif
@@ -1926,7 +1926,7 @@ pmap_create()
 
 	/* init uvm_object */
 	for (i = 0; i < PTP_LEVELS - 1; i++) {
-		simple_lock_init(&pmap->pm_obj[i].vmobjlock);
+		simple_lock_init(&pmap->pm_obj[i].vmobjlock, IPL_NONE/*XXXUNVERIFIED*/);
 		pmap->pm_obj[i].pgops = NULL;	/* not a mappable object */
 		TAILQ_INIT(&pmap->pm_obj[i].memq);
 		pmap->pm_obj[i].uo_npages = 0;
Index: src/sys/arch/amiga/amiga/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amiga/amiga/pmap.c,v
retrieving revision 1.108
diff -u -u -p -r1.108 pmap.c
--- src/sys/arch/amiga/amiga/pmap.c	27 Sep 2003 19:34:17 -0000	1.108
+++ src/sys/arch/amiga/amiga/pmap.c	9 Mar 2004 18:57:08 -0000
@@ -465,7 +465,7 @@ pmap_bootstrap(firstaddr, loadaddr)
 		pmap_ishift = SG_ISHIFT;
 #endif
 
-	simple_lock_init(&pmap_kernel()->pm_lock);
+	simple_lock_init(&pmap_kernel()->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	pmap_kernel()->pm_count = 1;
 
 	/*
@@ -850,7 +850,7 @@ pmap_pinit(pmap)
 		pmap->pm_stfree = protostfree;
 #endif
 	pmap->pm_count = 1;
-	simple_lock_init(&pmap->pm_lock);
+	simple_lock_init(&pmap->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 }
 
 /*
Index: src/sys/arch/arm/arm32/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/arm32/pmap.c,v
retrieving revision 1.147
diff -u -u -p -r1.147 pmap.c
--- src/sys/arch/arm/arm32/pmap.c	18 Jan 2004 13:03:50 -0000	1.147
+++ src/sys/arch/arm/arm32/pmap.c	9 Mar 2004 18:57:13 -0000
@@ -1892,7 +1892,7 @@ pmap_create(void)
 
 	pm = pool_cache_get(&pmap_pmap_cache, PR_WAITOK);
 
-	simple_lock_init(&pm->pm_lock);
+	simple_lock_init(&pm->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	pm->pm_obj.pgops = NULL;	/* currently not a mappable object */
 	TAILQ_INIT(&pm->pm_obj.memq);
 	pm->pm_obj.uo_npages = 0;
@@ -3839,7 +3839,7 @@ pmap_bootstrap(pd_entry_t *kernel_l1pt, 
 	pm->pm_l1 = l1;
 	pm->pm_domain = PMAP_DOMAIN_KERNEL;
 	pm->pm_cstate.cs_all = PMAP_CACHE_STATE_ALL;
-	simple_lock_init(&pm->pm_lock);
+	simple_lock_init(&pm->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	pm->pm_obj.pgops = NULL;
 	TAILQ_INIT(&pm->pm_obj.memq);
 	pm->pm_obj.uo_npages = 0;
@@ -3977,14 +3977,14 @@ pmap_bootstrap(pd_entry_t *kernel_l1pt, 
 	 */
 	SLIST_INIT(&l1_list);
 	TAILQ_INIT(&l1_lru_list);
-	simple_lock_init(&l1_lru_lock);
+	simple_lock_init(&l1_lru_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	pmap_init_l1(l1, kernel_l1pt);
 
 	/*
 	 * Initialize the pmap pool and cache
 	 */
 	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 	pool_cache_init(&pmap_pmap_cache, &pmap_pmap_pool,
 	    pmap_pmap_ctor, NULL, NULL);
 	LIST_INIT(&pmap_pmaps);
@@ -3994,13 +3994,13 @@ pmap_bootstrap(pd_entry_t *kernel_l1pt, 
 	 * Initialize the pv pool.
 	 */
 	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvepl",
-	    &pmap_bootstrap_pv_allocator);
+	    &pmap_bootstrap_pv_allocator, IPL_NONE/*XXXUNVERIFIED*/);
 
 	/*
 	 * Initialize the L2 dtable pool and cache.
 	 */
 	pool_init(&pmap_l2dtable_pool, sizeof(struct l2_dtable), 0, 0, 0,
-	    "l2dtblpl", NULL);
+	    "l2dtblpl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_cache_init(&pmap_l2dtable_cache, &pmap_l2dtable_pool,
 	    pmap_l2dtable_ctor, NULL, NULL);
 
@@ -4008,7 +4008,7 @@ pmap_bootstrap(pd_entry_t *kernel_l1pt, 
 	 * Initialise the L2 descriptor table pool and cache
 	 */
 	pool_init(&pmap_l2ptp_pool, L2_TABLE_SIZE_REAL, 0, L2_TABLE_SIZE_REAL,
-	    0, "l2ptppl", NULL);
+	    0, "l2ptppl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_cache_init(&pmap_l2ptp_cache, &pmap_l2ptp_pool,
 	    pmap_l2ptp_ctor, NULL, NULL);
 
Index: src/sys/arch/arm/include/arm32/vmparam.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/include/arm32/vmparam.h,v
retrieving revision 1.19
diff -u -u -p -r1.19 vmparam.h
--- src/sys/arch/arm/include/arm32/vmparam.h	22 May 2003 05:25:48 -0000	1.19
+++ src/sys/arch/arm/include/arm32/vmparam.h	9 Mar 2004 18:57:13 -0000
@@ -123,7 +123,7 @@ struct vm_page_md {
 #define	VM_MDPAGE_INIT(pg)						\
 do {									\
 	(pg)->mdpage.pvh_list = NULL;					\
-	simple_lock_init(&(pg)->mdpage.pvh_slock);			\
+	simple_lock_init(&(pg)->mdpage.pvh_slock, IPL_NONE/*XXXUNVERIFIED*/);			\
 	(pg)->mdpage.pvh_attrs = 0;					\
 	(pg)->mdpage.uro_mappings = 0;					\
 	(pg)->mdpage.urw_mappings = 0;					\
Index: src/sys/arch/arm/s3c2xx0/sscom.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/sscom.c,v
retrieving revision 1.11
diff -u -u -p -r1.11 sscom.c
--- src/sys/arch/arm/s3c2xx0/sscom.c	7 Aug 2003 16:26:54 -0000	1.11
+++ src/sys/arch/arm/s3c2xx0/sscom.c	9 Mar 2004 18:57:15 -0000
@@ -410,7 +410,7 @@ sscom_attach_subr(struct sscom_softc *sc
 
 	callout_init(&sc->sc_diag_callout);
 #if (defined(MULTIPROCESSOR) || defined(LOCKDEBUG)) && defined(SSCOM_MPLOCK)
-	simple_lock_init(&sc->sc_lock);
+	simple_lock_init(&sc->sc_lock, IPL_NONE/*XXXUNVERIFIED*/);
 #endif
 
 	sc->sc_ucon = UCON_RXINT_ENABLE|UCON_TXINT_ENABLE;
Index: src/sys/arch/arm/sa11x0/sa11x0_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/sa11x0/sa11x0_com.c,v
retrieving revision 1.19
diff -u -u -p -r1.19 sa11x0_com.c
--- src/sys/arch/arm/sa11x0/sa11x0_com.c	7 Aug 2003 16:26:54 -0000	1.19
+++ src/sys/arch/arm/sa11x0/sa11x0_com.c	9 Mar 2004 18:57:17 -0000
@@ -306,7 +306,7 @@ sacom_attach_subr(sc)
 	struct tty *tp;
 
 #if (defined(MULTIPROCESSOR) || defined(LOCKDEBUG)) && defined(COM_MPLOCK)
-	simple_lock_init(&sc->sc_lock);
+	simple_lock_init(&sc->sc_lock, IPL_NONE/*XXXUNVERIFIED*/);
 #endif
 
 	/* XXX Do we need to disable interrupts here? */
Index: src/sys/arch/arm/xscale/iopaau.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/iopaau.c,v
retrieving revision 1.11
diff -u -u -p -r1.11 iopaau.c
--- src/sys/arch/arm/xscale/iopaau.c	30 Oct 2003 22:04:39 -0000	1.11
+++ src/sys/arch/arm/xscale/iopaau.c	9 Mar 2004 18:57:17 -0000
@@ -656,10 +656,10 @@ iopaau_attach(struct iopaau_softc *sc)
 	 */
 	pool_init(&aau_desc_4_pool, sizeof(struct aau_desc_4),
 	    8 * 4, offsetof(struct aau_desc_4, d_nda), 0, "aaud4pl",
-	    NULL);
+	    NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_init(&aau_desc_8_pool, sizeof(struct aau_desc_8),
 	    8 * 4, offsetof(struct aau_desc_8, d_nda), 0, "aaud8pl",
-	    NULL);
+	    NULL, IPL_NONE/*XXXUNVERIFIED*/);
 
 	pool_cache_init(&iopaau_desc_4_cache, &aau_desc_4_pool,
 	    iopaau_desc_ctor, NULL, NULL);
Index: src/sys/arch/atari/atari/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/atari/pmap.c,v
retrieving revision 1.86
diff -u -u -p -r1.86 pmap.c
--- src/sys/arch/atari/atari/pmap.c	27 Sep 2003 20:01:58 -0000	1.86
+++ src/sys/arch/atari/atari/pmap.c	9 Mar 2004 18:57:20 -0000
@@ -429,7 +429,7 @@ u_int	hw_addr, hw_pages;
 	else pmap_ishift = SG_ISHIFT;
 #endif
 
-	simple_lock_init(&pmap_kernel()->pm_lock);
+	simple_lock_init(&pmap_kernel()->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	pmap_kernel()->pm_count = 1;
 
 	/*
@@ -809,7 +809,7 @@ pmap_pinit(pmap)
 		pmap->pm_stfree = protostfree;
 #endif
 	pmap->pm_count = 1;
-	simple_lock_init(&pmap->pm_lock);
+	simple_lock_init(&pmap->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 }
 
 /*
Index: src/sys/arch/cesfic/cesfic/pmap_bootstrap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cesfic/cesfic/pmap_bootstrap.c,v
retrieving revision 1.5
diff -u -u -p -r1.5 pmap_bootstrap.c
--- src/sys/arch/cesfic/cesfic/pmap_bootstrap.c	7 Aug 2003 16:27:15 -0000	1.5
+++ src/sys/arch/cesfic/cesfic/pmap_bootstrap.c	9 Mar 2004 18:57:21 -0000
@@ -417,7 +417,7 @@ pmap_bootstrap(nextpa, firstpa)
 
 		kpm->pm_stab = RELOC(Sysseg, st_entry_t *);
 		kpm->pm_ptab = RELOC(Sysmap, pt_entry_t *);
-		simple_lock_init(&kpm->pm_lock);
+		simple_lock_init(&kpm->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		kpm->pm_count = 1;
 		kpm->pm_stpa = (st_entry_t *)kstpa;
 		/*
Index: src/sys/arch/cesfic/dev/zs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cesfic/dev/zs.c,v
retrieving revision 1.8
diff -u -u -p -r1.8 zs.c
--- src/sys/arch/cesfic/dev/zs.c	15 Jul 2003 01:29:21 -0000	1.8
+++ src/sys/arch/cesfic/dev/zs.c	9 Mar 2004 18:57:22 -0000
@@ -147,7 +147,7 @@ zs_config(zsc, base)
 			cs->cs_defspeed = 9600;
 		}
 		zsc->zsc_cs[channel] = cs;
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 
 		cs->cs_defcflag = CREAD | CS8 | HUPCL;
 
Index: src/sys/arch/evbarm/dev/plcom.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/dev/plcom.c,v
retrieving revision 1.9
diff -u -u -p -r1.9 plcom.c
--- src/sys/arch/evbarm/dev/plcom.c	7 Aug 2003 16:27:20 -0000	1.9
+++ src/sys/arch/evbarm/dev/plcom.c	9 Mar 2004 18:57:24 -0000
@@ -388,7 +388,7 @@ plcom_attach_subr(struct plcom_softc *sc
 
 	callout_init(&sc->sc_diag_callout);
 #if (defined(MULTIPROCESSOR) || defined(LOCKDEBUG)) && defined(PLCOM_MPLOCK)
-	simple_lock_init(&sc->sc_lock);
+	simple_lock_init(&sc->sc_lock, IPL_NONE/*XXXUNVERIFIED*/);
 #endif
 
 	/* Disable interrupts before configuring the device. */
Index: src/sys/arch/hp300/hp300/pmap_bootstrap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp300/hp300/pmap_bootstrap.c,v
retrieving revision 1.24
diff -u -u -p -r1.24 pmap_bootstrap.c
--- src/sys/arch/hp300/hp300/pmap_bootstrap.c	17 Nov 2003 14:37:59 -0000	1.24
+++ src/sys/arch/hp300/hp300/pmap_bootstrap.c	9 Mar 2004 18:57:25 -0000
@@ -483,7 +483,7 @@ pmap_bootstrap(nextpa, firstpa)
 
 		kpm->pm_stab = RELOC(Sysseg, st_entry_t *);
 		kpm->pm_ptab = RELOC(Sysmap, pt_entry_t *);
-		simple_lock_init(&kpm->pm_lock);
+		simple_lock_init(&kpm->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		kpm->pm_count = 1;
 		kpm->pm_stpa = (st_entry_t *)kstpa;
 		/*
Index: src/sys/arch/hpcarm/dev/j720ssp.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hpcarm/dev/j720ssp.c,v
retrieving revision 1.21
diff -u -u -p -r1.21 j720ssp.c
--- src/sys/arch/hpcarm/dev/j720ssp.c	27 Oct 2003 17:17:42 -0000	1.21
+++ src/sys/arch/hpcarm/dev/j720ssp.c	9 Mar 2004 18:57:27 -0000
@@ -248,7 +248,7 @@ j720sspattach(parent, self, aux)
 	}
 
 	sc->sc_ssp_status = J720_SSP_STATUS_NONE;
-	simple_lock_init(&sc->sc_ssp_status_lock);
+	simple_lock_init(&sc->sc_ssp_status_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	kthread_create(j720ssp_create_kthread, sc);
 
 	sc->sc_enabled = 0;
Index: src/sys/arch/hpcmips/hpcmips/interrupt.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hpcmips/hpcmips/interrupt.c,v
retrieving revision 1.8
diff -u -u -p -r1.8 interrupt.c
--- src/sys/arch/hpcmips/hpcmips/interrupt.c	15 Jul 2003 02:29:32 -0000	1.8
+++ src/sys/arch/hpcmips/hpcmips/interrupt.c	9 Mar 2004 18:57:28 -0000
@@ -150,7 +150,7 @@ softintr_init(void)
 		asi = &hpcmips_soft_intrs[i];
 		TAILQ_INIT(&asi->softintr_q);
 		asi->softintr_ipl = IPL_SOFT + i;
-		simple_lock_init(&asi->softintr_slock);
+		simple_lock_init(&asi->softintr_slock, IPL_NONE/*XXXUNVERIFIED*/);
 		evcnt_attach_dynamic(&asi->softintr_evcnt, EVCNT_TYPE_INTR,
 		    NULL, "soft", softintr_names[i]);
 	}
Index: src/sys/arch/hppa/hppa/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hppa/hppa/pmap.c,v
retrieving revision 1.12
diff -u -u -p -r1.12 pmap.c
--- src/sys/arch/hppa/hppa/pmap.c	5 Jan 2004 02:25:32 -0000	1.12
+++ src/sys/arch/hppa/hppa/pmap.c	9 Mar 2004 18:57:30 -0000
@@ -822,9 +822,9 @@ pmap_bootstrap(vaddr_t *vstart, vaddr_t 
 #if	NCPUS > 1
 	lock_init(&pmap_lock, FALSE, ETAP_VM_PMAP_SYS, ETAP_VM_PMAP_SYS_I);
 #endif	/* NCPUS > 1 */
-	simple_lock_init(&kernel_pmap->pmap_lock);
-	simple_lock_init(&pmap_freelock);
-	simple_lock_init(&sid_pid_lock);
+	simple_lock_init(&kernel_pmap->pmap_lock, IPL_NONE/*XXXUNVERIFIED*/);
+	simple_lock_init(&pmap_freelock, IPL_NONE/*XXXUNVERIFIED*/);
+	simple_lock_init(&sid_pid_lock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	kernel_pmap->pmap_refcnt = 1;
 	kernel_pmap->pmap_space = HPPA_SID_KERNEL;
@@ -1212,7 +1212,7 @@ pmap_pinit(pmap_t pmap)
 		if (pid == 0)
 			panic ("no more pmap ids\n");
 
-		simple_lock_init(&pmap->pmap_lock);
+		simple_lock_init(&pmap->pmap_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	}
 
 	s = splvm();
Index: src/sys/arch/i386/i386/cpu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/i386/cpu.c,v
retrieving revision 1.18
diff -u -u -p -r1.18 cpu.c
--- src/sys/arch/i386/i386/cpu.c	20 Feb 2004 17:35:01 -0000	1.18
+++ src/sys/arch/i386/i386/cpu.c	9 Mar 2004 18:57:31 -0000
@@ -290,7 +290,7 @@ cpu_attach(parent, self, aux)
 #endif
 	ci->ci_func = caa->cpu_func;
 
-	simple_lock_init(&ci->ci_slock);
+	simple_lock_init(&ci->ci_slock, IPL_NONE/*XXXUNVERIFIED*/);
 
 #if defined(MULTIPROCESSOR)
 	/*
Index: src/sys/arch/i386/i386/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/i386/machdep.c,v
retrieving revision 1.550
diff -u -u -p -r1.550 machdep.c
--- src/sys/arch/i386/i386/machdep.c	5 Mar 2004 11:34:17 -0000	1.550
+++ src/sys/arch/i386/i386/machdep.c	9 Mar 2004 18:57:34 -0000
@@ -1123,7 +1123,7 @@ setregs(l, pack, stack)
 union	descriptor *gdt, *ldt;
 struct gate_descriptor *idt;
 char idt_allocmap[NIDT];
-struct simplelock idt_lock = SIMPLELOCK_INITIALIZER;
+struct simplelock idt_lock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 #ifdef I586_CPU
 union	descriptor *pentium_idt;
 #endif
Index: src/sys/arch/i386/i386/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/i386/pmap.c,v
retrieving revision 1.171
diff -u -u -p -r1.171 pmap.c
--- src/sys/arch/i386/i386/pmap.c	20 Feb 2004 17:35:01 -0000	1.171
+++ src/sys/arch/i386/i386/pmap.c	9 Mar 2004 18:57:37 -0000
@@ -951,7 +951,7 @@ pmap_bootstrap(kva_start)
 	 */
 
 	kpm = pmap_kernel();
-	simple_lock_init(&kpm->pm_obj.vmobjlock);
+	simple_lock_init(&kpm->pm_obj.vmobjlock, IPL_NONE/*XXXUNVERIFIED*/);
 	kpm->pm_obj.pgops = NULL;
 	TAILQ_INIT(&kpm->pm_obj.memq);
 	kpm->pm_obj.uo_npages = 0;
@@ -1101,8 +1101,8 @@ pmap_bootstrap(kva_start)
 #if defined(MULTIPROCESSOR) || defined(LOCKDEBUG)
 	spinlockinit(&pmap_main_lock, "pmaplk", 0);
 #endif
-	simple_lock_init(&pvalloc_lock);
-	simple_lock_init(&pmaps_lock);
+	simple_lock_init(&pvalloc_lock, IPL_NONE/*XXXUNVERIFIED*/);
+	simple_lock_init(&pmaps_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	LIST_INIT(&pmaps);
 	TAILQ_INIT(&pv_freepages);
 	TAILQ_INIT(&pv_unusedpgs);
@@ -1112,7 +1112,7 @@ pmap_bootstrap(kva_start)
 	 */
 
 	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 
 	/*
 	 * Initialize the TLB shootdown queues.
@@ -1129,7 +1129,7 @@ pmap_bootstrap(kva_start)
 	 * initialize the PDE pool and cache.
 	 */
 	pool_init(&pmap_pdp_pool, PAGE_SIZE, 0, 0, 0, "pdppl",
-		  &pool_allocator_nointr);
+		  &pool_allocator_nointr, IPL_NONE);
 	pool_cache_init(&pmap_pdp_cache, &pmap_pdp_pool,
 			pmap_pdp_ctor, NULL, NULL);
 
@@ -1717,7 +1717,7 @@ pmap_create()
 	pmap = pool_get(&pmap_pmap_pool, PR_WAITOK);
 
 	/* init uvm_object */
-	simple_lock_init(&pmap->pm_obj.vmobjlock);
+	simple_lock_init(&pmap->pm_obj.vmobjlock, IPL_NONE/*XXXUNVERIFIED*/);
 	pmap->pm_obj.pgops = NULL;	/* currently not a mappable object */
 	TAILQ_INIT(&pmap->pm_obj.memq);
 	pmap->pm_obj.uo_npages = 0;
Index: src/sys/arch/i386/include/vmparam.h
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/include/vmparam.h,v
retrieving revision 1.56
diff -u -u -p -r1.56 vmparam.h
--- src/sys/arch/i386/include/vmparam.h	23 Oct 2003 08:30:21 -0000	1.56
+++ src/sys/arch/i386/include/vmparam.h	9 Mar 2004 18:57:39 -0000
@@ -139,7 +139,7 @@
 #define	__HAVE_VM_PAGE_MD
 #define	VM_MDPAGE_INIT(pg)					\
 	memset(&(pg)->mdpage, 0, sizeof((pg)->mdpage));		\
-	simple_lock_init(&(pg)->mdpage.mp_pvhead.pvh_lock);	\
+	simple_lock_init(&(pg)->mdpage.mp_pvhead.pvh_lock, IPL_NONE/*XXXUNVERIFIED*/);	\
 	SPLAY_INIT(&(pg)->mdpage.mp_pvhead.pvh_root);
 
 struct pv_entry;
Index: src/sys/arch/luna68k/luna68k/pmap_bootstrap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/luna68k/luna68k/pmap_bootstrap.c,v
retrieving revision 1.7
diff -u -u -p -r1.7 pmap_bootstrap.c
--- src/sys/arch/luna68k/luna68k/pmap_bootstrap.c	7 Aug 2003 16:28:09 -0000	1.7
+++ src/sys/arch/luna68k/luna68k/pmap_bootstrap.c	9 Mar 2004 18:57:40 -0000
@@ -395,7 +395,7 @@ pmap_bootstrap(nextpa, firstpa)
 
 		kpm->pm_stab = RELOC(Sysseg, st_entry_t *);
 		kpm->pm_ptab = RELOC(Sysmap, pt_entry_t *);
-		simple_lock_init(&kpm->pm_lock);
+		simple_lock_init(&kpm->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		kpm->pm_count = 1;
 		kpm->pm_stpa = (st_entry_t *)kstpa;
 		/*
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
===================================================================
RCS file: /cvsroot/src/sys/arch/m68k/m68k/pmap_motorola.c,v
retrieving revision 1.11
diff -u -u -p -r1.11 pmap_motorola.c
--- src/sys/arch/m68k/m68k/pmap_motorola.c	1 Nov 2003 17:16:30 -0000	1.11
+++ src/sys/arch/m68k/m68k/pmap_motorola.c	9 Mar 2004 18:57:43 -0000
@@ -520,7 +520,7 @@ pmap_init()
 	 * Initialize the pmap pools.
 	 */
 	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 
 	/*
 	 * Now that this is done, mark the pages shared with the
@@ -770,7 +770,7 @@ pmap_pinit(pmap)
 		pmap->pm_stfree = protostfree;
 #endif
 	pmap->pm_count = 1;
-	simple_lock_init(&pmap->pm_lock);
+	simple_lock_init(&pmap->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 }
 
 /*
Index: src/sys/arch/mac68k/dev/zs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mac68k/dev/zs.c,v
retrieving revision 1.44
diff -u -u -p -r1.44 zs.c
--- src/sys/arch/mac68k/dev/zs.c	4 Dec 2003 13:05:16 -0000	1.44
+++ src/sys/arch/mac68k/dev/zs.c	9 Mar 2004 18:57:43 -0000
@@ -287,7 +287,7 @@ zsc_attach(parent, self, aux)
 		cs  = &xcs->xzs_cs;
 		zsc->zsc_cs[channel] = cs;
 
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		cs->cs_channel = channel;
 		cs->cs_private = NULL;
 		cs->cs_ops = &zsops_null;
Index: src/sys/arch/mac68k/mac68k/iop.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mac68k/mac68k/iop.c,v
retrieving revision 1.7
diff -u -u -p -r1.7 iop.c
--- src/sys/arch/mac68k/mac68k/iop.c	15 Jul 2003 02:43:20 -0000	1.7
+++ src/sys/arch/mac68k/mac68k/iop.c	9 Mar 2004 18:57:44 -0000
@@ -176,7 +176,7 @@ iop_init(fullinit)
 	ioph = iop->iop;
 	printf("SCC IOP base: 0x%x\n", (unsigned) ioph);
 	pool_init(&iop->pool, sizeof(struct iop_msg), 0, 0, 0, "mac68k_iop1",
-		  NULL);
+		  NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	ioph->control_status = IOP_BYPASS;
 
 	iop = &mac68k_iops[ISM_IOP];
@@ -184,7 +184,7 @@ iop_init(fullinit)
 	printf("ISM IOP base: 0x%x, alive %x\n", (unsigned) ioph, 
 	(unsigned) iop_alive(ioph));
 	pool_init(&iop->pool, sizeof(struct iop_msg), 0, 0, 0, "mac68k_iop2",
-		  NULL);
+		  NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	iop_write1(ioph, IOP_ADDR_ALIVE, 0);
 
 /*
Index: src/sys/arch/mac68k/mac68k/pmap_bootstrap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mac68k/mac68k/pmap_bootstrap.c,v
retrieving revision 1.60
diff -u -u -p -r1.60 pmap_bootstrap.c
--- src/sys/arch/mac68k/mac68k/pmap_bootstrap.c	7 Aug 2003 16:28:22 -0000	1.60
+++ src/sys/arch/mac68k/mac68k/pmap_bootstrap.c	9 Mar 2004 18:57:45 -0000
@@ -522,7 +522,7 @@ pmap_bootstrap(nextpa, firstpa)
 
 		kpm->pm_stab = Sysseg;
 		kpm->pm_ptab = Sysmap;
-		simple_lock_init(&kpm->pm_lock);
+		simple_lock_init(&kpm->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		kpm->pm_count = 1;
 		kpm->pm_stpa = (st_entry_t *)kstpa;
 		/*
Index: src/sys/arch/macppc/dev/zs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/zs.c,v
retrieving revision 1.28
diff -u -u -p -r1.28 zs.c
--- src/sys/arch/macppc/dev/zs.c	4 Dec 2003 13:05:16 -0000	1.28
+++ src/sys/arch/macppc/dev/zs.c	9 Mar 2004 18:57:45 -0000
@@ -272,7 +272,7 @@ zsc_attach(parent, self, aux)
 		cs  = &xcs->xzs_cs;
 		zsc->zsc_cs[channel] = cs;
 
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		cs->cs_channel = channel;
 		cs->cs_private = NULL;
 		cs->cs_ops = &zsops_null;
Index: src/sys/arch/mips/alchemy/dev/aucom.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/dev/aucom.c,v
retrieving revision 1.13
diff -u -u -p -r1.13 aucom.c
--- src/sys/arch/mips/alchemy/dev/aucom.c	8 Nov 2003 05:12:51 -0000	1.13
+++ src/sys/arch/mips/alchemy/dev/aucom.c	9 Mar 2004 18:57:48 -0000
@@ -480,7 +480,7 @@ com_attach_subr(struct com_softc *sc)
 
 	callout_init(&sc->sc_diag_callout);
 #if (defined(MULTIPROCESSOR) || defined(LOCKDEBUG)) && defined(COM_MPLOCK)
-	simple_lock_init(&sc->sc_lock);
+	simple_lock_init(&sc->sc_lock, IPL_NONE/*XXXUNVERIFIED*/);
 #endif
 
 	/* Disable interrupts before configuring the device. */
Index: src/sys/arch/mips/mips/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/mips/pmap.c,v
retrieving revision 1.155
diff -u -u -p -r1.155 pmap.c
--- src/sys/arch/mips/mips/pmap.c	30 Dec 2003 12:33:16 -0000	1.155
+++ src/sys/arch/mips/mips/pmap.c	9 Mar 2004 18:57:50 -0000
@@ -359,14 +359,14 @@ pmap_bootstrap()
 	 * Initialize the pools.
 	 */
 	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvpl",
-	    &pmap_pv_page_allocator);
+	    &pmap_pv_page_allocator, IPL_NONE/*XXXUNVERIFIED*/);
 
 	/*
 	 * Initialize the kernel pmap.
 	 */
-	simple_lock_init(&pmap_kernel()->pm_lock);
+	simple_lock_init(&pmap_kernel()->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	pmap_kernel()->pm_count = 1;
 	pmap_kernel()->pm_asid = PMAP_ASID_RESERVED;
 	pmap_kernel()->pm_asidgen = 0;
@@ -551,7 +551,7 @@ pmap_create()
 	pmap = pool_get(&pmap_pmap_pool, PR_WAITOK);
 	memset(pmap, 0, sizeof(*pmap));
 
-	simple_lock_init(&pmap->pm_lock);
+	simple_lock_init(&pmap->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	pmap->pm_count = 1;
 	if (free_segtab) {
 		pmap->pm_segtab = free_segtab;
Index: src/sys/arch/mips/mips/softintr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/mips/softintr.c,v
retrieving revision 1.3
diff -u -u -p -r1.3 softintr.c
--- src/sys/arch/mips/mips/softintr.c	15 Jul 2003 02:43:39 -0000	1.3
+++ src/sys/arch/mips/mips/softintr.c	9 Mar 2004 18:57:50 -0000
@@ -70,7 +70,7 @@ softintr_init(void)
 	for (i = 0; i < _IPL_NSOFT; i++) {
 		msi = &mips_soft_intrs[i];
 		TAILQ_INIT(&msi->softintr_q);
-		simple_lock_init(&msi->softintr_slock);
+		simple_lock_init(&msi->softintr_slock, IPL_NONE/*XXXUNVERIFIED*/);
 		msi->softintr_ipl = IPL_SOFT + i;
 		evcnt_attach_dynamic(&msi->softintr_evcnt, EVCNT_TYPE_INTR,
 		    NULL, "soft", softintr_names[i]);
Index: src/sys/arch/mipsco/obio/zs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mipsco/obio/zs.c,v
retrieving revision 1.17
diff -u -u -p -r1.17 zs.c
--- src/sys/arch/mipsco/obio/zs.c	15 Jul 2003 02:43:44 -0000	1.17
+++ src/sys/arch/mipsco/obio/zs.c	9 Mar 2004 18:57:51 -0000
@@ -235,7 +235,7 @@ zs_attach(parent, self, aux)
 		ch = &zsc->zsc_cs_store[channel];
 		cs = zsc->zsc_cs[channel] = (struct zs_chanstate *)ch;
 
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		cs->cs_reg_csr = NULL;
 		cs->cs_reg_data = NULL;
 		cs->cs_channel = channel;
Index: src/sys/arch/mvme68k/dev/zs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mvme68k/dev/zs.c,v
retrieving revision 1.33
diff -u -u -p -r1.33 zs.c
--- src/sys/arch/mvme68k/dev/zs.c	4 Dec 2003 12:42:54 -0000	1.33
+++ src/sys/arch/mvme68k/dev/zs.c	9 Mar 2004 18:57:51 -0000
@@ -154,7 +154,7 @@ zs_config(zsc, zs, vector, pclk)
 		zsc_args.hwflags = zs_hwflags[zsc_unit][channel];
 		cs = &zsc->zsc_cs_store[channel];
 		zsc->zsc_cs[channel] = cs;
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 
 		/*
 		 * If we're the console, copy the channel state, and
Index: src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c,v
retrieving revision 1.21
diff -u -u -p -r1.21 pmap_bootstrap.c
--- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c	7 Aug 2003 16:28:43 -0000	1.21
+++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c	9 Mar 2004 18:57:52 -0000
@@ -517,7 +517,7 @@ pmap_bootstrap(nextpa, firstpa)
 
 		kpm->pm_stab = RELOC(Sysseg, st_entry_t *);
 		kpm->pm_ptab = RELOC(Sysmap, pt_entry_t *);
-		simple_lock_init(&kpm->pm_lock);
+		simple_lock_init(&kpm->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		kpm->pm_count = 1;
 		kpm->pm_stpa = (st_entry_t *)kstpa;
 #if defined(M68040) || defined(M68060)
Index: src/sys/arch/news68k/dev/zs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/news68k/dev/zs.c,v
retrieving revision 1.18
diff -u -u -p -r1.18 zs.c
--- src/sys/arch/news68k/dev/zs.c	15 Jul 2003 02:59:26 -0000	1.18
+++ src/sys/arch/news68k/dev/zs.c	9 Mar 2004 18:57:53 -0000
@@ -218,7 +218,7 @@ zs_attach(parent, self, aux)
 	for (channel = 0; channel < 2; channel++) {
 		zsc_args.channel = channel;
 		cs = &zsc->zsc_cs_store[channel];
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 
 		zsc->zsc_cs[channel] = cs;
 		zc = (channel == 0) ? &zs->zs_chan_a : &zs->zs_chan_b;
Index: src/sys/arch/news68k/news68k/pmap_bootstrap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/news68k/news68k/pmap_bootstrap.c,v
retrieving revision 1.10
diff -u -u -p -r1.10 pmap_bootstrap.c
--- src/sys/arch/news68k/news68k/pmap_bootstrap.c	7 Aug 2003 16:28:52 -0000	1.10
+++ src/sys/arch/news68k/news68k/pmap_bootstrap.c	9 Mar 2004 18:57:54 -0000
@@ -444,7 +444,7 @@ pmap_bootstrap(nextpa, firstpa)
 
 		kpm->pm_stab = RELOC(Sysseg, st_entry_t *);
 		kpm->pm_ptab = RELOC(Sysmap, pt_entry_t *);
-		simple_lock_init(&kpm->pm_lock);
+		simple_lock_init(&kpm->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		kpm->pm_count = 1;
 		kpm->pm_stpa = (st_entry_t *)kstpa;
 		/*
Index: src/sys/arch/newsmips/apbus/zs_ap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/newsmips/apbus/zs_ap.c,v
retrieving revision 1.16
diff -u -u -p -r1.16 zs_ap.c
--- src/sys/arch/newsmips/apbus/zs_ap.c	15 Jul 2003 02:59:29 -0000	1.16
+++ src/sys/arch/newsmips/apbus/zs_ap.c	9 Mar 2004 18:57:54 -0000
@@ -256,7 +256,7 @@ zs_ap_attach(parent, self, aux)
 		cs = &zsc->zsc_cs_store[channel];
 		zsc->zsc_cs[channel] = cs;
 
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		cs->cs_channel = channel;
 		cs->cs_private = NULL;
 		cs->cs_ops = &zsops_null;
Index: src/sys/arch/newsmips/dev/zs_hb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/newsmips/dev/zs_hb.c,v
retrieving revision 1.17
diff -u -u -p -r1.17 zs_hb.c
--- src/sys/arch/newsmips/dev/zs_hb.c	15 Jul 2003 02:59:30 -0000	1.17
+++ src/sys/arch/newsmips/dev/zs_hb.c	9 Mar 2004 18:57:54 -0000
@@ -238,7 +238,7 @@ zs_hb_attach(parent, self, aux)
 		cs = &zsc->zsc_cs_store[channel];
 		zsc->zsc_cs[channel] = cs;
 
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		cs->cs_channel = channel;
 		cs->cs_private = NULL;
 		cs->cs_ops = &zsops_null;
Index: src/sys/arch/next68k/dev/zs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/next68k/dev/zs.c,v
retrieving revision 1.23
diff -u -u -p -r1.23 zs.c
--- src/sys/arch/next68k/dev/zs.c	15 Jul 2003 02:59:32 -0000	1.23
+++ src/sys/arch/next68k/dev/zs.c	9 Mar 2004 18:57:55 -0000
@@ -243,7 +243,7 @@ zs_attach(parent, self, aux)
 		cs = &zsc->zsc_cs_store[channel];
 		zsc->zsc_cs[channel] = cs;
 
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		cs->cs_channel = channel;
 		cs->cs_private = NULL;
 		cs->cs_ops = &zsops_null;
Index: src/sys/arch/next68k/next68k/pmap_bootstrap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/next68k/next68k/pmap_bootstrap.c,v
retrieving revision 1.17
diff -u -u -p -r1.17 pmap_bootstrap.c
--- src/sys/arch/next68k/next68k/pmap_bootstrap.c	13 Feb 2004 11:36:16 -0000	1.17
+++ src/sys/arch/next68k/next68k/pmap_bootstrap.c	9 Mar 2004 18:57:56 -0000
@@ -603,7 +603,7 @@ pmap_bootstrap(nextpa, firstpa)
 
 		kpm->pm_stab = RELOC(Sysseg, st_entry_t *);
 		kpm->pm_ptab = RELOC(Sysmap, pt_entry_t *);
-		simple_lock_init(&kpm->pm_lock);
+		simple_lock_init(&kpm->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		kpm->pm_count = 1;
 		kpm->pm_stpa = (st_entry_t *)kstpa;
 #if defined(M68040) || defined(M68060)
Index: src/sys/arch/ofppc/firepower/firepower_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ofppc/firepower/firepower_pci.c,v
retrieving revision 1.3
diff -u -u -p -r1.3 firepower_pci.c
--- src/sys/arch/ofppc/firepower/firepower_pci.c	15 Jul 2003 02:46:31 -0000	1.3
+++ src/sys/arch/ofppc/firepower/firepower_pci.c	9 Mar 2004 18:57:56 -0000
@@ -68,7 +68,7 @@ pcireg_t	firepower_pci_conf_read(void *,
 void		firepower_pci_conf_write(void *, pcitag_t, int, pcireg_t);
 
 /* Firepower systems can be multi-processor. */
-struct simplelock firepower_pci_conf_slock = SIMPLELOCK_INITIALIZER;
+struct simplelock firepower_pci_conf_slock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 
 #define	PCI_CONF_LOCK(s)						\
 do {									\
Index: src/sys/arch/pc532/pc532/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/pc532/pc532/pmap.c,v
retrieving revision 1.74
diff -u -u -p -r1.74 pmap.c
--- src/sys/arch/pc532/pc532/pmap.c	15 Jul 2003 02:54:35 -0000	1.74
+++ src/sys/arch/pc532/pc532/pmap.c	9 Mar 2004 18:57:59 -0000
@@ -682,7 +682,7 @@ pmap_bootstrap(kva_start)
 	 */
 
 	kpm = pmap_kernel();
-	simple_lock_init(&kpm->pm_obj.vmobjlock);
+	simple_lock_init(&kpm->pm_obj.vmobjlock, IPL_NONE/*XXXUNVERIFIED*/);
 	kpm->pm_obj.pgops = NULL;
 	TAILQ_INIT(&kpm->pm_obj.memq);
 	kpm->pm_obj.uo_npages = 0;
@@ -740,11 +740,11 @@ pmap_bootstrap(kva_start)
 	 */
 
 	spinlockinit(&pmap_main_lock, "pmaplk", 0);
-	simple_lock_init(&pvalloc_lock);
-	simple_lock_init(&pmaps_lock);
-	simple_lock_init(&pmap_copy_page_lock);
-	simple_lock_init(&pmap_zero_page_lock);
-	simple_lock_init(&pmap_tmpptp_lock);
+	simple_lock_init(&pvalloc_lock, IPL_NONE/*XXXUNVERIFIED*/);
+	simple_lock_init(&pmaps_lock, IPL_NONE/*XXXUNVERIFIED*/);
+	simple_lock_init(&pmap_copy_page_lock, IPL_NONE/*XXXUNVERIFIED*/);
+	simple_lock_init(&pmap_zero_page_lock, IPL_NONE/*XXXUNVERIFIED*/);
+	simple_lock_init(&pmap_tmpptp_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	LIST_INIT(&pmaps);
 	TAILQ_INIT(&pv_freepages);
 	TAILQ_INIT(&pv_unusedpgs);
@@ -754,14 +754,14 @@ pmap_bootstrap(kva_start)
 	 */
 
 	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-		  &pool_allocator_nointr);
+		  &pool_allocator_nointr, IPL_NONE);
 
 	/*
 	 * initialize the PDE pool and cache.
 	 */
 
 	pool_init(&pmap_pdp_pool, PAGE_SIZE, 0, 0, 0, "pdppl",
-		  &pool_allocator_nointr);
+		  &pool_allocator_nointr, IPL_NONE);
 	pool_cache_init(&pmap_pdp_cache, &pmap_pdp_pool,
 			pmap_pdp_ctor, NULL, NULL);
 
@@ -823,7 +823,7 @@ pmap_init()
 		for (i = 0;
 		     i < (vm_physmem[lcv].end - vm_physmem[lcv].start); i++) {
 			simple_lock_init(
-			    &vm_physmem[lcv].pmseg.pvhead[i].pvh_lock);
+			    &vm_physmem[lcv].pmseg.pvhead[i].pvh_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		}
 	}
 
@@ -1378,7 +1378,7 @@ pmap_create()
 	pmap = pool_get(&pmap_pmap_pool, PR_WAITOK);
 
 	/* init uvm_object */
-	simple_lock_init(&pmap->pm_obj.vmobjlock);
+	simple_lock_init(&pmap->pm_obj.vmobjlock, IPL_NONE/*XXXUNVERIFIED*/);
 	pmap->pm_obj.pgops = NULL;	/* currently not a mappable object */
 	TAILQ_INIT(&pmap->pm_obj.memq);
 	pmap->pm_obj.uo_npages = 0;
Index: src/sys/arch/pdp10/pdp10/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/pdp10/pdp10/pmap.c,v
retrieving revision 1.1
diff -u -u -p -r1.1 pmap.c
--- src/sys/arch/pdp10/pdp10/pmap.c	19 Aug 2003 10:55:00 -0000	1.1
+++ src/sys/arch/pdp10/pdp10/pmap.c	9 Mar 2004 18:58:00 -0000
@@ -158,7 +158,7 @@ pmap_bootstrap()
 #endif
 #if 0
 	kernel_pmap_store.pm_count = 1;
-	simple_lock_init(&kernel_pmap_store.pm_lock);
+	simple_lock_init(&kernel_pmap_store.pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 #endif
 
 	/*
Index: src/sys/arch/playstation2/playstation2/interrupt.c
===================================================================
RCS file: /cvsroot/src/sys/arch/playstation2/playstation2/interrupt.c,v
retrieving revision 1.2
diff -u -u -p -r1.2 interrupt.c
--- src/sys/arch/playstation2/playstation2/interrupt.c	15 Jul 2003 02:54:38 -0000	1.2
+++ src/sys/arch/playstation2/playstation2/interrupt.c	9 Mar 2004 18:58:00 -0000
@@ -122,7 +122,7 @@ interrupt_init(void)
 		TAILQ_INIT(&asi->softintr_q);
 
 		asi->softintr_ipl = IPL_SOFT + i;
-		simple_lock_init(&asi->softintr_slock);
+		simple_lock_init(&asi->softintr_slock, IPL_NONE/*XXXUNVERIFIED*/);
 		evcnt_attach_dynamic(&asi->softintr_evcnt, EVCNT_TYPE_INTR,
 		    NULL, "soft", softintr_names[i]);
 	}
Index: src/sys/arch/powerpc/ibm4xx/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/ibm4xx/pmap.c,v
retrieving revision 1.28
diff -u -u -p -r1.28 pmap.c
--- src/sys/arch/powerpc/ibm4xx/pmap.c	18 Dec 2003 14:15:55 -0000	1.28
+++ src/sys/arch/powerpc/ibm4xx/pmap.c	9 Mar 2004 18:58:02 -0000
@@ -466,7 +466,7 @@ pmap_init(void)
 	splx(s);
 
 	/* Setup a pool for additional pvlist structures */
-	pool_init(&pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pv_entry", NULL);
+	pool_init(&pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pv_entry", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 }
 
 /*
Index: src/sys/arch/powerpc/oea/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/oea/pmap.c,v
retrieving revision 1.20
diff -u -u -p -r1.20 pmap.c
--- src/sys/arch/powerpc/oea/pmap.c	13 Feb 2004 11:36:17 -0000	1.20
+++ src/sys/arch/powerpc/oea/pmap.c	9 Mar 2004 18:58:05 -0000
@@ -1042,7 +1042,7 @@ pmap_init(void)
 
 	pool_init(&pmap_mpvo_pool, sizeof(struct pvo_entry),
 	    sizeof(struct pvo_entry), 0, 0, "pmap_mpvopl",
-	    &pmap_pool_mallocator);
+	    &pmap_pool_mallocator, IPL_NONE/*XXXUNVERIFIED*/);
 
 	pool_setlowat(&pmap_mpvo_pool, 1008);
 
@@ -3122,10 +3122,10 @@ pmap_bootstrap(paddr_t kernelstart, padd
 
 	pool_init(&pmap_upvo_pool, sizeof(struct pvo_entry),
 	    sizeof(struct pvo_entry), 0, 0, "pmap_upvopl",
-	    &pmap_pool_uallocator);
+	    &pmap_pool_uallocator, IPL_NONE/*XXXUNVERIFIED*/);
 
 	pool_setlowat(&pmap_upvo_pool, 252);
 
 	pool_init(&pmap_pool, sizeof(struct pmap),
-	    sizeof(void *), 0, 0, "pmap_pl", &pmap_pool_uallocator);
+	    sizeof(void *), 0, 0, "pmap_pl", &pmap_pool_uallocator, IPL_NONE/*XXXUNVERIFIED*/);
 }
Index: src/sys/arch/sgimips/dev/zs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/dev/zs.c,v
retrieving revision 1.22
diff -u -u -p -r1.22 zs.c
--- src/sys/arch/sgimips/dev/zs.c	18 Jan 2004 13:00:05 -0000	1.22
+++ src/sys/arch/sgimips/dev/zs.c	9 Mar 2004 18:58:06 -0000
@@ -242,7 +242,7 @@ zs_hpc_attach(struct device *parent, str
 		ch = &zsc->zsc_cs_store[channel];
 		cs = zsc->zsc_cs[channel] = (struct zs_chanstate *)ch;
 
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		cs->cs_reg_csr = NULL;
 		cs->cs_reg_data = NULL;
 		cs->cs_channel = channel;
Index: src/sys/arch/sgimips/hpc/sbic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/hpc/sbic.c,v
retrieving revision 1.17
diff -u -u -p -r1.17 sbic.c
--- src/sys/arch/sgimips/hpc/sbic.c	10 Jan 2004 02:55:54 -0000	1.17
+++ src/sys/arch/sgimips/hpc/sbic.c	9 Mar 2004 18:58:08 -0000
@@ -239,7 +239,7 @@ wd33c93_init(struct wd33c93_softc *dev)
 	if (!wd33c93_pool_initialized) {
 		/* All instances share the same pool */
 		pool_init(&wd33c93_pool, sizeof(struct wd33c93_acb), 0, 0, 0,
-		    "wd33c93_acb", NULL);
+		    "wd33c93_acb", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 		++wd33c93_pool_initialized;
 	}
 
Index: src/sys/arch/sh3/sh3/interrupt.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sh3/sh3/interrupt.c,v
retrieving revision 1.12
diff -u -u -p -r1.12 interrupt.c
--- src/sys/arch/sh3/sh3/interrupt.c	20 Nov 2003 01:22:19 -0000	1.12
+++ src/sys/arch/sh3/sh3/interrupt.c	9 Mar 2004 18:58:09 -0000
@@ -340,7 +340,7 @@ softintr_init()
 		TAILQ_INIT(&asi->softintr_q);
 
 		asi->softintr_ipl = IPL_SOFT + i;
-		simple_lock_init(&asi->softintr_slock);
+		simple_lock_init(&asi->softintr_slock, IPL_NONE/*XXXUNVERIFIED*/);
 		evcnt_attach_dynamic(&asi->softintr_evcnt, EVCNT_TYPE_INTR,
 		    NULL, "soft", softintr_names[i]);
 	}
Index: src/sys/arch/sh3/sh3/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sh3/sh3/pmap.c,v
retrieving revision 1.50
diff -u -u -p -r1.50 pmap.c
--- src/sys/arch/sh3/sh3/pmap.c	30 Dec 2003 12:33:19 -0000	1.50
+++ src/sys/arch/sh3/sh3/pmap.c	9 Mar 2004 18:58:10 -0000
@@ -216,9 +216,9 @@ pmap_init()
 
 	/* Initialize pmap module */
 	pool_init(&__pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 	pool_init(&__pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvpl",
-	    &pmap_pv_page_allocator);
+	    &pmap_pv_page_allocator, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_setlowat(&__pmap_pv_pool, 16);
 }
 
Index: src/sys/arch/sh5/sh5/interrupt.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sh5/sh5/interrupt.c,v
retrieving revision 1.8
diff -u -u -p -r1.8 interrupt.c
--- src/sys/arch/sh5/sh5/interrupt.c	15 Jul 2003 03:36:00 -0000	1.8
+++ src/sys/arch/sh5/sh5/interrupt.c	9 Mar 2004 18:58:10 -0000
@@ -137,7 +137,7 @@ sh5_intr_init(void (*int_enable)(void *,
 	int i;
 
 	pool_init(&intrhand_pool, INTRHAND_SIZE, SH5_CACHELINE_SIZE,
-	    0, 0, NULL, NULL);
+	    0, 0, NULL, NULL, IPL_NONE/*XXXUNVERIFIED*/);
 
 	intr_enable = int_enable;
 	intr_disable = int_disable;
Index: src/sys/arch/sh5/sh5/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sh5/sh5/pmap.c,v
retrieving revision 1.35
diff -u -u -p -r1.35 pmap.c
--- src/sys/arch/sh5/sh5/pmap.c	13 Feb 2004 11:36:17 -0000	1.35
+++ src/sys/arch/sh5/sh5/pmap.c	9 Mar 2004 18:58:13 -0000
@@ -1156,7 +1156,7 @@ pmap_bootstrap(vaddr_t avail, paddr_t ks
 	pmap_kernel()->pm_asidgen = 0;
 
 	pool_init(&pmap_upvo_pool, sizeof(struct pvo_entry),
-	    0, 0, 0, "pmap_upvopl", &pmap_pool_uallocator);
+	    0, 0, 0, "pmap_upvopl", &pmap_pool_uallocator, IPL_NONE/*XXXUNVERIFIED*/);
 
 	pool_setlowat(&pmap_upvo_pool, 252);
 }
@@ -1237,10 +1237,10 @@ pmap_init(void)
 	s = splvm();
 
 	pool_init(&pmap_pool, sizeof(struct pmap),
-	    sizeof(void *), 0, 0, "pmap_pl", NULL);
+	    sizeof(void *), 0, 0, "pmap_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 
 	pool_init(&pmap_mpvo_pool, sizeof(struct pvo_entry),
-	    0, 0, 0, "pmap_mpvopl", NULL);
+	    0, 0, 0, "pmap_mpvopl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 
 	pool_setlowat(&pmap_mpvo_pool, 1008);
 
Index: src/sys/arch/sh5/sh5/softintr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sh5/sh5/softintr.c,v
retrieving revision 1.5
diff -u -u -p -r1.5 softintr.c
--- src/sys/arch/sh5/sh5/softintr.c	15 Jul 2003 03:36:00 -0000	1.5
+++ src/sys/arch/sh5/sh5/softintr.c	9 Mar 2004 18:58:13 -0000
@@ -129,7 +129,7 @@ softintr_init(void)
 		si = &soft_intrs[i];
 		TAILQ_INIT(&si->si_q);
 
-		simple_lock_init(&si->si_slock);
+		simple_lock_init(&si->si_slock, IPL_NONE/*XXXUNVERIFIED*/);
 		si->si_evcnt = &_sh5_intr_events[soft_intr_prio[i]];
 		si->si_ipl = soft_intr_prio[i];
 	}
Index: src/sys/arch/sparc/dev/zs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/zs.c,v
retrieving revision 1.99
diff -u -u -p -r1.99 zs.c
--- src/sys/arch/sparc/dev/zs.c	13 Feb 2004 11:36:17 -0000	1.99
+++ src/sys/arch/sparc/dev/zs.c	9 Mar 2004 18:58:14 -0000
@@ -448,7 +448,7 @@ zs_attach(zsc, zsd, pri)
 		cs = &zsc->zsc_cs_store[channel];
 		zsc->zsc_cs[channel] = cs;
 
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		cs->cs_channel = channel;
 		cs->cs_private = NULL;
 		cs->cs_ops = &zsops_null;
Index: src/sys/arch/sparc/include/vmparam.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/include/vmparam.h,v
retrieving revision 1.35
diff -u -u -p -r1.35 vmparam.h
--- src/sys/arch/sparc/include/vmparam.h	7 Aug 2003 16:29:42 -0000	1.35
+++ src/sys/arch/sparc/include/vmparam.h	9 Mar 2004 18:58:14 -0000
@@ -151,7 +151,7 @@ struct vm_page_md {
 	(pg)->mdpage.pvlisthead.pv_pmap = NULL;		\
 	(pg)->mdpage.pvlisthead.pv_va = 0;		\
 	(pg)->mdpage.pvlisthead.pv_flags = 0;		\
-	simple_lock_init(&(pg)->mdpage.pv_slock);	\
+	simple_lock_init(&(pg)->mdpage.pv_slock, IPL_NONE/*XXXUNVERIFIED*/);	\
 } while(/*CONSTCOND*/0)
 
 #endif /* _SPARC_VMPARAM_H_ */
Index: src/sys/arch/sparc/sparc/cpu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/cpu.c,v
retrieving revision 1.180
diff -u -u -p -r1.180 cpu.c
--- src/sys/arch/sparc/sparc/cpu.c	13 Feb 2004 11:36:17 -0000	1.180
+++ src/sys/arch/sparc/sparc/cpu.c	9 Mar 2004 18:58:16 -0000
@@ -144,7 +144,7 @@ struct cpu_info	*alloc_cpuinfo __P((void
 int go_smp_cpus = 0;	/* non-primary CPUs wait for this to go */
 
 /* lock this to send IPI's */
-struct simplelock xpmsg_lock = SIMPLELOCK_INITIALIZER;
+struct simplelock xpmsg_lock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 
 struct cpu_info *
 alloc_cpuinfo_global_va(ismaster, sizep)
Index: src/sys/arch/sparc/sparc/intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/intr.c,v
retrieving revision 1.83
diff -u -u -p -r1.83 intr.c
--- src/sys/arch/sparc/sparc/intr.c	7 Aug 2003 16:29:44 -0000	1.83
+++ src/sys/arch/sparc/sparc/intr.c	9 Mar 2004 18:58:17 -0000
@@ -206,7 +206,7 @@ int	(*moduleerr_handler) __P((void));
 
 #if defined(MULTIPROCESSOR)
 volatile int nmi_hard_wait = 0;
-struct simplelock nmihard_lock = SIMPLELOCK_INITIALIZER;
+struct simplelock nmihard_lock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 int drop_into_rom_on_fatal = 1;
 #endif
 
Index: src/sys/arch/sparc/sparc/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/machdep.c,v
retrieving revision 1.244
diff -u -u -p -r1.244 machdep.c
--- src/sys/arch/sparc/sparc/machdep.c	1 Jan 2004 15:02:32 -0000	1.244
+++ src/sys/arch/sparc/sparc/machdep.c	9 Mar 2004 18:58:19 -0000
@@ -140,7 +140,7 @@ extern paddr_t avail_end;
 
 int	physmem;
 
-struct simplelock fpulock = SIMPLELOCK_INITIALIZER;
+struct simplelock fpulock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 
 /*
  * safepri is a safe priority for sleep to set for a spin-wait
Index: src/sys/arch/sparc/sparc/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/pmap.c,v
retrieving revision 1.276
diff -u -u -p -r1.276 pmap.c
--- src/sys/arch/sparc/sparc/pmap.c	13 Feb 2004 11:36:18 -0000	1.276
+++ src/sys/arch/sparc/sparc/pmap.c	9 Mar 2004 18:58:26 -0000
@@ -648,7 +648,7 @@ static __inline__ void sp_tlb_flush_all(
  */
 
 #if defined(SUN4D)
-static struct simplelock sun4d_tlb_lock = SIMPLELOCK_INITIALIZER;
+static struct simplelock sun4d_tlb_lock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 #define LOCK_4DTLB()	simple_lock(&sun4d_tlb_lock);
 #define UNLOCK_4DTLB()	simple_unlock(&sun4d_tlb_lock);
 #else
@@ -738,7 +738,7 @@ smp_tlb_flush_all()
  * recommended in the SuperSPARC user's manual.
  */
 int updatepte4m (vaddr_t, int *, int, int, int, u_int);
-static struct simplelock pte4m_lock = SIMPLELOCK_INITIALIZER;
+static struct simplelock pte4m_lock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 
 int
 updatepte4m(va, pte, bic, bis, ctx, cpuset)
@@ -3135,7 +3135,7 @@ pmap_bootstrap(nctx, nregion, nsegment)
 	 * Initialize the locks.
 	 */
 	spinlockinit(&pmap_main_lock, "pmaplk", 0);
-	simple_lock_init(&kernel_pmap_store.pm_lock);
+	simple_lock_init(&kernel_pmap_store.pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	/*
 	 * Grab physical memory list.
@@ -3366,7 +3366,7 @@ pmap_bootstrap4_4c(top, nctx, nregion, n
 	 *
 	 * XXX sun4c could use context 0 for users?
 	 */
-	simple_lock_init(&ctx_lock);
+	simple_lock_init(&ctx_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	ci->c_pmap = pmap_kernel();
 	ctx_freelist = ci + 1;
 	for (i = 1; i < ncontext; i++) {
@@ -3851,7 +3851,7 @@ pmap_bootstrap4m(top)
 	/*
 	 * Set up the ctxinfo structures (freelist of contexts)
 	 */
-	simple_lock_init(&ctx_lock);
+	simple_lock_init(&ctx_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	ci->c_pmap = pmap_kernel();
 	ctx_freelist = ci + 1;
 	for (i = 1; i < ncontext; i++) {
@@ -4143,7 +4143,7 @@ pmap_init()
 	vm_num_phys = vm_last_phys - vm_first_phys;
 
 	/* Setup a pool for additional pvlist structures */
-	pool_init(&pv_pool, sizeof(struct pvlist), 0, 0, 0, "pvtable", NULL);
+	pool_init(&pv_pool, sizeof(struct pvlist), 0, 0, 0, "pvtable", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 
 	/*
 	 * Setup a pool for pmap structures.
@@ -4155,12 +4155,12 @@ pmap_init()
 	     ncpu * sizeof(int *) +		/* pm_reg_ptps */
 	     ncpu * sizeof(int);		/* pm_reg_ptps_pa */
 	pool_init(&pmap_pmap_pool, sz, 0, 0, 0, "pmappl",
-		  &pool_allocator_nointr);
+		  &pool_allocator_nointr, IPL_NONE);
 	pool_cache_init(&pmap_pmap_pool_cache, &pmap_pmap_pool,
 			pmap_pmap_pool_ctor, pmap_pmap_pool_dtor, NULL);
 
 	sz = NSEGRG * sizeof (struct segmap);
-	pool_init(&segmap_pool, sz, 0, 0, 0, "segmap", NULL);
+	pool_init(&segmap_pool, sz, 0, 0, 0, "segmap", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 
 #if defined(SUN4M) || defined(SUN4D)
 	if (CPU_HAS_SRMMU) {
@@ -4171,17 +4171,17 @@ pmap_init()
 		 */
 		sz = SRMMU_L1SIZE * sizeof(int);
 		pool_init(&L1_pool, sz, sz, 0, 0, "L1 pagetable",
-			  &pgt_page_allocator);
+			  &pgt_page_allocator, IPL_NONE/*XXXUNVERIFIED*/);
 
 		sz = SRMMU_L2SIZE * sizeof(int);
 		pool_init(&L23_pool, sz, sz, 0, 0, "L2/L3 pagetable",
-			  &pgt_page_allocator);
+			  &pgt_page_allocator, IPL_NONE/*XXXUNVERIFIED*/);
 	}
 #endif /* SUN4M || SUN4D */
 #if defined(SUN4) || defined(SUN4C)
 	if (CPU_ISSUN4 || CPU_ISSUN4C) {
 		sz = NPTESG * sizeof(int);
-		pool_init(&pte_pool, sz, 0, 0, 0, "ptemap", NULL);
+		pool_init(&pte_pool, sz, 0, 0, 0, "ptemap", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	}
 #endif /* SUN4 || SUN4C */
 }
@@ -4320,7 +4320,7 @@ pmap_pmap_pool_ctor(void *arg, void *obj
 	qzero((caddr_t)pm->pm_regmap, NUREG * sizeof(struct regmap));
 
 	/* pm->pm_ctx = NULL; // already done */
-	simple_lock_init(&pm->pm_lock);
+	simple_lock_init(&pm->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	if (CPU_ISSUN4 || CPU_ISSUN4C) {
 		TAILQ_INIT(&pm->pm_seglist);
Index: src/sys/arch/sparc64/dev/zs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/zs.c,v
retrieving revision 1.50
diff -u -u -p -r1.50 zs.c
--- src/sys/arch/sparc64/dev/zs.c	13 Feb 2004 11:36:18 -0000	1.50
+++ src/sys/arch/sparc64/dev/zs.c	9 Mar 2004 18:58:26 -0000
@@ -291,7 +291,7 @@ zs_attach(zsc, zsd, pri)
 		cs = &zsc->zsc_cs_store[channel];
 		zsc->zsc_cs[channel] = cs;
 
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		cs->cs_channel = channel;
 		cs->cs_private = NULL;
 		cs->cs_ops = &zsops_null;
Index: src/sys/arch/sparc64/sparc64/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/sparc64/pmap.c,v
retrieving revision 1.154
diff -u -u -p -r1.154 pmap.c
--- src/sys/arch/sparc64/sparc64/pmap.c	12 Feb 2004 03:25:48 -0000	1.154
+++ src/sys/arch/sparc64/sparc64/pmap.c	9 Mar 2004 18:58:30 -0000
@@ -1172,7 +1172,7 @@ remap_data:
 	/*
 	 * Allocate and clear out pmap_kernel()->pm_segs[]
 	 */
-	simple_lock_init(&pmap_kernel()->pm_lock);
+	simple_lock_init(&pmap_kernel()->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	pmap_kernel()->pm_refs = 1;
 	pmap_kernel()->pm_ctx = 0;
 
@@ -1415,9 +1415,9 @@ pmap_init()
 	 * initialize the pmap pools.
 	 */
 	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pv_entry",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 
 	vm_first_phys = avail_start;
 	vm_num_phys = avail_end - avail_start;
@@ -1499,7 +1499,7 @@ pmap_create()
 	memset(pm, 0, sizeof *pm);
 	DPRINTF(PDB_CREATE, ("pmap_create(): created %p\n", pm));
 
-	simple_lock_init(&pm->pm_lock);
+	simple_lock_init(&pm->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	pm->pm_refs = 1;
 	TAILQ_INIT(&pm->pm_obj.memq);
 	if (pm != pmap_kernel()) {
Index: src/sys/arch/sun2/dev/zs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sun2/dev/zs.c,v
retrieving revision 1.9
diff -u -u -p -r1.9 zs.c
--- src/sys/arch/sun2/dev/zs.c	13 Feb 2004 11:36:19 -0000	1.9
+++ src/sys/arch/sun2/dev/zs.c	9 Mar 2004 18:58:30 -0000
@@ -180,7 +180,7 @@ zs_attach(zsc, zsd, pri)
 		cs = &zsc->zsc_cs_store[channel];
 		zsc->zsc_cs[channel] = cs;
 
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		cs->cs_channel = channel;
 		cs->cs_private = NULL;
 		cs->cs_ops = &zsops_null;
Index: src/sys/arch/sun2/sun2/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sun2/sun2/pmap.c,v
retrieving revision 1.24
diff -u -u -p -r1.24 pmap.c
--- src/sys/arch/sun2/sun2/pmap.c	15 Jul 2003 03:36:13 -0000	1.24
+++ src/sys/arch/sun2/sun2/pmap.c	9 Mar 2004 18:58:33 -0000
@@ -1523,7 +1523,7 @@ pmap_common_init(pmap)
 	pmap->pm_refcount = 1;
 	pmap->pm_version = pmap_version++;
 	pmap->pm_ctxnum = EMPTY_CONTEXT;
-	simple_lock_init(&pmap->pm_lock);
+	simple_lock_init(&pmap->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 }
 
 /*
@@ -1838,7 +1838,7 @@ pmap_init()
 
 	/* Initialize the pmap pool. */
 	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 }
 
 /*
Index: src/sys/arch/sun3/dev/zs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sun3/dev/zs.c,v
retrieving revision 1.72
diff -u -u -p -r1.72 zs.c
--- src/sys/arch/sun3/dev/zs.c	15 Jul 2003 03:36:16 -0000	1.72
+++ src/sys/arch/sun3/dev/zs.c	9 Mar 2004 18:58:34 -0000
@@ -290,7 +290,7 @@ zs_attach(parent, self, aux)
 		cs = &zsc->zsc_cs_store[channel];
 		zsc->zsc_cs[channel] = cs;
 
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		cs->cs_channel = channel;
 		cs->cs_private = NULL;
 		cs->cs_ops = &zsops_null;
Index: src/sys/arch/sun3/sun3/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sun3/sun3/pmap.c,v
retrieving revision 1.144
diff -u -u -p -r1.144 pmap.c
--- src/sys/arch/sun3/sun3/pmap.c	15 Jul 2003 03:36:18 -0000	1.144
+++ src/sys/arch/sun3/sun3/pmap.c	9 Mar 2004 18:58:37 -0000
@@ -1527,7 +1527,7 @@ pmap_common_init(pmap)
 	pmap->pm_refcount = 1;
 	pmap->pm_version = pmap_version++;
 	pmap->pm_ctxnum = EMPTY_CONTEXT;
-	simple_lock_init(&pmap->pm_lock);
+	simple_lock_init(&pmap->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 }
 
 /*
@@ -1867,7 +1867,7 @@ pmap_init()
 
 	/* Initialize the pmap pool. */
 	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 }
 
 /*
Index: src/sys/arch/sun3/sun3x/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sun3/sun3x/pmap.c,v
retrieving revision 1.84
diff -u -u -p -r1.84 pmap.c
--- src/sys/arch/sun3/sun3x/pmap.c	26 Sep 2003 22:23:58 -0000	1.84
+++ src/sys/arch/sun3/sun3x/pmap.c	9 Mar 2004 18:58:41 -0000
@@ -812,7 +812,7 @@ pmap_bootstrap(nextva)
 	kernel_pmap.pm_a_tmgr = NULL;
 	kernel_pmap.pm_a_phys = kernAphys;
 	kernel_pmap.pm_refcount = 1; /* always in use */
-	simple_lock_init(&kernel_pmap.pm_lock);
+	simple_lock_init(&kernel_pmap.pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	kernel_crp.rp_attr = MMU_LONG_DTE_LU | MMU_DT_LONG;
 	kernel_crp.rp_addr = kernAphys;
@@ -1065,7 +1065,7 @@ pmap_init()
 
 	/** Initialize the pmap pools **/
 	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 }
 
 /* pmap_init_a_tables()			INTERNAL
@@ -2499,7 +2499,7 @@ pmap_pinit(pmap)
 	pmap->pm_a_tmgr = NULL;
 	pmap->pm_a_phys = kernAphys;
 	pmap->pm_refcount = 1;
-	simple_lock_init(&pmap->pm_lock);
+	simple_lock_init(&pmap->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 }
 
 /* pmap_release				INTERFACE
Index: src/sys/arch/vax/vax/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/vax/pmap.c,v
retrieving revision 1.133
diff -u -u -p -r1.133 pmap.c
--- src/sys/arch/vax/vax/pmap.c	13 Feb 2004 11:36:20 -0000	1.133
+++ src/sys/arch/vax/vax/pmap.c	9 Mar 2004 18:58:43 -0000
@@ -379,7 +379,7 @@ pmap_bootstrap()
 	    /* btop(virtual_avail - KERNBASE); */
 
 	pmap->pm_count = 1;
-	simple_lock_init(&pmap->pm_lock);
+	simple_lock_init(&pmap->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	/* Activate the kernel pmap. */
 	mtpr(pcb->P1BR = pmap->pm_p1br, PR_P1BR);
@@ -398,7 +398,7 @@ pmap_bootstrap()
 	curcpu()->ci_flags = CI_MASTERCPU|CI_RUNNING;
 #endif
 #if defined(MULTIPROCESSOR) || defined(LOCKDEBUG)
-	simple_lock_init(&pvtable_lock);
+	simple_lock_init(&pvtable_lock, IPL_NONE/*XXXUNVERIFIED*/);
 #endif
 
 	/*
@@ -874,7 +874,7 @@ pmap_create()
 	MALLOC(pmap, struct pmap *, sizeof(*pmap), M_VMPMAP, M_WAITOK);
 	bzero(pmap, sizeof(struct pmap));
 	pmap_pinit(pmap);
-	simple_lock_init(&pmap->pm_lock);
+	simple_lock_init(&pmap->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	return (pmap);
 }
 
Index: src/sys/arch/x68k/dev/zs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/dev/zs.c,v
retrieving revision 1.25
diff -u -u -p -r1.25 zs.c
--- src/sys/arch/x68k/dev/zs.c	15 Jul 2003 01:44:53 -0000	1.25
+++ src/sys/arch/x68k/dev/zs.c	9 Mar 2004 18:58:44 -0000
@@ -214,7 +214,7 @@ zs_attach(parent, self, aux)
 		cs = &zsc->zsc_cs_store[channel];
 		zsc->zsc_cs[channel] = cs;
 
-		simple_lock_init(&cs->cs_lock);
+		simple_lock_init(&cs->cs_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		cs->cs_channel = channel;
 		cs->cs_private = NULL;
 		cs->cs_ops = &zsops_null;
Index: src/sys/arch/x68k/x68k/pmap_bootstrap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/x68k/pmap_bootstrap.c,v
retrieving revision 1.26
diff -u -u -p -r1.26 pmap_bootstrap.c
--- src/sys/arch/x68k/x68k/pmap_bootstrap.c	7 Aug 2003 16:30:31 -0000	1.26
+++ src/sys/arch/x68k/x68k/pmap_bootstrap.c	9 Mar 2004 18:58:44 -0000
@@ -398,7 +398,7 @@ pmap_bootstrap(nextpa, firstpa)
 
 		kpm->pm_stab = RELOC(Sysseg, st_entry_t *);
 		kpm->pm_ptab = RELOC(Sysmap, pt_entry_t *);
-		simple_lock_init(&kpm->pm_lock);
+		simple_lock_init(&kpm->pm_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		kpm->pm_count = 1;
 		kpm->pm_stpa = (st_entry_t *)kstpa;
 #if defined(M68040) || defined(M68060)
Index: src/sys/arch/x86/include/intr.h
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/include/intr.h,v
retrieving revision 1.12
diff -u -u -p -r1.12 intr.h
--- src/sys/arch/x86/include/intr.h	4 Mar 2004 19:10:10 -0000	1.12
+++ src/sys/arch/x86/include/intr.h	9 Mar 2004 18:58:45 -0000
@@ -41,6 +41,7 @@
 
 #ifdef _KERNEL_OPT
 #include "opt_multiprocessor.h"
+#include "opt_ddb.h"
 #endif
 
 #include <machine/intrdefs.h>
@@ -116,6 +117,8 @@ extern void Xspllower(int);
 static __inline int splraise(int);
 static __inline void spllower(int);
 static __inline void softintr(int);
+static __inline int spl_is_blocked(int);
+static __inline int spl_in_context(void);
 
 /*
  * Convert spl level to local APIC level
@@ -168,6 +171,31 @@ spllower(int nlevel)
 		Xspllower(nlevel);
 }
 
+static __inline int
+spl_is_blocked(int level)
+{
+	struct cpu_info *ci = curcpu();
+	return (ci->ci_ilevel >= level);
+}
+
+static __inline int
+spl_in_context()
+{
+	struct cpu_info *ci = curcpu();
+	return (ci->ci_idepth > 0);
+}
+
+#ifdef SPLDEBUG
+#ifdef DDB
+extern label_t *db_recover;
+#define SPL_ASSERT(x)  do { if (!cold && !db_recover) KASSERT(x); } while(0)
+#else
+#define SPL_ASSERT(x)  do { if (!cold) KASSERT(x); } while(0)
+#endif
+#else
+#define SPL_ASSERT(x)
+#endif
+
 /*
  * Hardware interrupt masks
  */
Index: src/sys/arch/x86/include/intrdefs.h
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/include/intrdefs.h,v
retrieving revision 1.3
diff -u -u -p -r1.3 intrdefs.h
--- src/sys/arch/x86/include/intrdefs.h	16 Jun 2003 20:01:06 -0000	1.3
+++ src/sys/arch/x86/include/intrdefs.h	9 Mar 2004 18:58:45 -0000
@@ -32,6 +32,7 @@
 #define	IPL_CLOCK	0xc	/* clock */
 #define IPL_SCHED	IPL_CLOCK
 #define	IPL_HIGH	0xd	/* everything */
+#define IPL_LOCK  IPL_HIGH
 #define	IPL_SERIAL	0xd	/* serial */
 #define IPL_IPI		0xe	/* inter-processor interrupts */
 #define	NIPL		16
Index: src/sys/arch/x86/pci/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/pci_machdep.c,v
retrieving revision 1.9
diff -u -u -p -r1.9 pci_machdep.c
--- src/sys/arch/x86/pci/pci_machdep.c	30 Oct 2003 21:19:54 -0000	1.9
+++ src/sys/arch/x86/pci/pci_machdep.c	9 Mar 2004 18:58:45 -0000
@@ -127,7 +127,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
 
 int pci_mode = -1;
 
-struct simplelock pci_conf_slock = SIMPLELOCK_INITIALIZER;
+struct simplelock pci_conf_slock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 
 #define	PCI_CONF_LOCK(s)						\
 do {									\
Index: src/sys/arch/x86/x86/softintr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/x86/softintr.c,v
retrieving revision 1.1
diff -u -u -p -r1.1 softintr.c
--- src/sys/arch/x86/x86/softintr.c	26 Feb 2003 21:26:12 -0000	1.1
+++ src/sys/arch/x86/x86/softintr.c	9 Mar 2004 18:58:46 -0000
@@ -58,6 +58,12 @@ const int x86_soft_intr_to_ssir[X86_NSOF
 	SIR_SERIAL,
 };
 
+const int x86_soft_intr_to_ipl[X86_NSOFTINTR] = {
+	IPL_SOFTCLOCK,
+	IPL_SOFTNET,
+	IPL_SOFTSERIAL,
+};
+
 /*
  * softintr_init:
  *
@@ -72,7 +78,8 @@ softintr_init(void)
 	for (i = 0; i < X86_NSOFTINTR; i++) {
 		si = &x86_soft_intrs[i];
 		TAILQ_INIT(&si->softintr_q);
-		simple_lock_init(&si->softintr_slock);
+		simple_lock_init(&si->softintr_slock,
+		    x86_soft_intr_to_ipl[i]);
 		si->softintr_ssir = x86_soft_intr_to_ssir[i];
 	}
 }
Index: src/sys/compat/mach/mach_message.c
===================================================================
RCS file: /cvsroot/src/sys/compat/mach/mach_message.c,v
retrieving revision 1.43
diff -u -u -p -r1.43 mach_message.c
--- src/sys/compat/mach/mach_message.c	2 Jan 2004 02:09:52 -0000	1.43
+++ src/sys/compat/mach/mach_message.c	9 Mar 2004 18:58:48 -0000
@@ -1165,7 +1165,7 @@ void
 mach_message_init(void)
 {
 	pool_init(&mach_message_pool, sizeof (struct mach_message),
-	    0, 0, 0, "mach_message_pool", NULL);
+	    0, 0, 0, "mach_message_pool", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	return;
 }
 
Index: src/sys/compat/mach/mach_port.c
===================================================================
RCS file: /cvsroot/src/sys/compat/mach/mach_port.c,v
retrieving revision 1.51
diff -u -u -p -r1.51 mach_port.c
--- src/sys/compat/mach/mach_port.c	1 Jan 2004 22:48:54 -0000	1.51
+++ src/sys/compat/mach/mach_port.c	9 Mar 2004 18:58:49 -0000
@@ -592,9 +592,9 @@ void 
 mach_port_init(void) 
 {
 	pool_init(&mach_port_pool, sizeof (struct mach_port),
-	    0, 0, 0, "mach_port_pool", NULL);
+	    0, 0, 0, "mach_port_pool", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_init(&mach_right_pool, sizeof (struct mach_right),
-	    0, 0, 0, "mach_right_pool", NULL);
+	    0, 0, 0, "mach_right_pool", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 
 	mach_bootstrap_port = mach_port_get();
 	mach_clock_port = mach_port_get();
Index: src/sys/compat/mach/mach_semaphore.c
===================================================================
RCS file: /cvsroot/src/sys/compat/mach/mach_semaphore.c,v
retrieving revision 1.10
diff -u -u -p -r1.10 mach_semaphore.c
--- src/sys/compat/mach/mach_semaphore.c	30 Dec 2003 00:15:46 -0000	1.10
+++ src/sys/compat/mach/mach_semaphore.c	9 Mar 2004 18:58:49 -0000
@@ -216,9 +216,9 @@ mach_semaphore_init(void)
 	LIST_INIT(&mach_semaphore_list);
 	lockinit(&mach_semaphore_list_lock, PZERO|PCATCH, "mach_sem", 0, 0);
 	pool_init(&mach_semaphore_list_pool, sizeof (struct mach_semaphore),
-	    0, 0, 0, "mach_sem_pool", NULL);
+	    0, 0, 0, "mach_sem_pool", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_init(&mach_waiting_lwp_pool, sizeof (struct mach_waiting_lwp),
-	    0, 0, 0, "mach_waitp_pool", NULL);
+	    0, 0, 0, "mach_waitp_pool", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 
 	return;
 }
Index: src/sys/dev/ccd.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ccd.c,v
retrieving revision 1.95
diff -u -u -p -r1.95 ccd.c
--- src/sys/dev/ccd.c	25 Jan 2004 18:06:48 -0000	1.95
+++ src/sys/dev/ccd.c	9 Mar 2004 18:58:51 -0000
@@ -253,7 +253,7 @@ ccdattach(num)
 
 	/* Initialize the component buffer pool. */
 	pool_init(&ccd_cbufpool, sizeof(struct ccdbuf), 0,
-	    0, 0, "ccdpl", NULL);
+	    0, 0, "ccdpl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 
 	/* Initialize per-softc structures. */
 	for (i = 0; i < num; i++) {
Index: src/sys/dev/cgd.c
===================================================================
RCS file: /cvsroot/src/sys/dev/cgd.c,v
retrieving revision 1.14
diff -u -u -p -r1.14 cgd.c
--- src/sys/dev/cgd.c	25 Jan 2004 18:06:48 -0000	1.14
+++ src/sys/dev/cgd.c	9 Mar 2004 18:58:52 -0000
@@ -209,7 +209,7 @@ cgdattach(int num)
 
 	/* Init component buffer pool. XXX, can we put this in dksubr.c? */
 	pool_init(&cgd_cbufpool, sizeof(struct cgdbuf), 0, 0, 0,
-	    "cgdpl", NULL);
+	    "cgdpl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 }
 
 int
Index: src/sys/dev/fss.c
===================================================================
RCS file: /cvsroot/src/sys/dev/fss.c,v
retrieving revision 1.7
diff -u -u -p -r1.7 fss.c
--- src/sys/dev/fss.c	24 Feb 2004 15:12:51 -0000	1.7
+++ src/sys/dev/fss.c	9 Mar 2004 18:58:53 -0000
@@ -164,7 +164,7 @@ fssattach(int num)
 		sc = &fss_softc[i];
 		sc->sc_unit = i;
 		sc->sc_bdev = NODEV;
-		simple_lock_init(&sc->sc_slock);
+		simple_lock_init(&sc->sc_slock, IPL_NONE/*XXXUNVERIFIED*/);
 		bufq_alloc(&sc->sc_bufq, BUFQ_FCFS|BUFQ_SORT_RAWBLOCK);
 	}
 }
Index: src/sys/dev/rnd.c
===================================================================
RCS file: /cvsroot/src/sys/dev/rnd.c,v
retrieving revision 1.42
diff -u -u -p -r1.42 rnd.c
--- src/sys/dev/rnd.c	29 Jun 2003 22:30:01 -0000	1.42
+++ src/sys/dev/rnd.c	9 Mar 2004 18:58:54 -0000
@@ -322,7 +322,7 @@ rnd_init(void)
 	SIMPLEQ_INIT(&rnd_samples);
 
 	pool_init(&rnd_mempool, sizeof(rnd_sample_t), 0, 0, 0, "rndsample",
-	    NULL);
+	    NULL, IPL_HIGH);
 
 	rndpool_init(&rnd_pool);
 
Index: src/sys/dev/vnd.c
===================================================================
RCS file: /cvsroot/src/sys/dev/vnd.c,v
retrieving revision 1.106
diff -u -u -p -r1.106 vnd.c
--- src/sys/dev/vnd.c	25 Jan 2004 18:06:48 -0000	1.106
+++ src/sys/dev/vnd.c	9 Mar 2004 18:58:55 -0000
@@ -950,9 +950,9 @@ vndioctl(dev, cmd, data, flag, p)
 
 		/* Initialize the xfer and buffer pools. */
 		pool_init(&vnd->sc_vxpool, sizeof(struct vndxfer), 0,
-		    0, 0, "vndxpl", NULL);
+		    0, 0, "vndxpl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 		pool_init(&vnd->sc_vbpool, sizeof(struct vndbuf), 0,
-		    0, 0, "vndbpl", NULL);
+		    0, 0, "vndbpl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 
 		/* Try and read the disklabel. */
 		vndgetdisklabel(dev);
Index: src/sys/dev/acpi/acpi.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpi.c,v
retrieving revision 1.57
diff -u -u -p -r1.57 acpi.c
--- src/sys/dev/acpi/acpi.c	3 Nov 2003 18:51:31 -0000	1.57
+++ src/sys/dev/acpi/acpi.c	9 Mar 2004 18:58:56 -0000
@@ -179,7 +179,7 @@ acpi_probe(void)
 		panic("acpi_probe: ACPI has already been probed");
 	beenhere = 1;
 
-	simple_lock_init(&acpi_slock);
+	simple_lock_init(&acpi_slock, IPL_NONE/*XXXUNVERIFIED*/);
 	acpi_locked = 0;
 
 	/*
Index: src/sys/dev/acpi/acpi_acad.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpi_acad.c,v
retrieving revision 1.12
diff -u -u -p -r1.12 acpi_acad.c
--- src/sys/dev/acpi/acpi_acad.c	3 Nov 2003 18:07:10 -0000	1.12
+++ src/sys/dev/acpi/acpi_acad.c	9 Mar 2004 18:58:56 -0000
@@ -161,7 +161,7 @@ acpiacad_attach(struct device *parent, s
 	printf(": ACPI AC Adapter\n");
 
 	sc->sc_node = aa->aa_node;
-	simple_lock_init(&sc->sc_lock);
+	simple_lock_init(&sc->sc_lock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	rv = AcpiInstallNotifyHandler(sc->sc_node->ad_handle,
 	    ACPI_DEVICE_NOTIFY, acpiacad_notify_handler, sc);
Index: src/sys/dev/acpi/acpi_bat.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpi_bat.c,v
retrieving revision 1.35
diff -u -u -p -r1.35 acpi_bat.c
--- src/sys/dev/acpi/acpi_bat.c	3 Nov 2003 18:07:10 -0000	1.35
+++ src/sys/dev/acpi/acpi_bat.c	9 Mar 2004 18:58:57 -0000
@@ -265,7 +265,7 @@ acpibat_attach(struct device *parent, st
 	printf(": ACPI Battery (Control Method)\n");
 
 	sc->sc_node = aa->aa_node;
-	simple_lock_init(&sc->sc_lock);
+	simple_lock_init(&sc->sc_lock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	rv = AcpiInstallNotifyHandler(sc->sc_node->ad_handle,
 				      ACPI_DEVICE_NOTIFY,
Index: src/sys/dev/acpi/acpi_ec.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpi_ec.c,v
retrieving revision 1.20
diff -u -u -p -r1.20 acpi_ec.c
--- src/sys/dev/acpi/acpi_ec.c	12 Nov 2003 13:59:23 -0000	1.20
+++ src/sys/dev/acpi/acpi_ec.c	9 Mar 2004 18:58:58 -0000
@@ -406,7 +406,7 @@ acpiec_attach(struct device *parent, str
 	printf(": ACPI Embedded Controller\n");
 
 	lockinit(&sc->sc_lock, PWAIT, "eclock", 0, 0);
-	simple_lock_init(&sc->sc_slock);
+	simple_lock_init(&sc->sc_slock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	sc->sc_node = aa->aa_node;
 
Index: src/sys/dev/acpi/acpi_tz.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpi_tz.c,v
retrieving revision 1.8
diff -u -u -p -r1.8 acpi_tz.c
--- src/sys/dev/acpi/acpi_tz.c	2 Feb 2004 10:36:19 -0000	1.8
+++ src/sys/dev/acpi/acpi_tz.c	9 Mar 2004 18:58:58 -0000
@@ -266,7 +266,7 @@ acpitz_init_envsys(struct acpitz_softc *
 {
 	int i;
 
-	simple_lock_init(&sc->sc_slock);
+	simple_lock_init(&sc->sc_slock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	for (i = 0; i < ATZ_NUMSENSORS; i++) {
 		sc->sc_data[i].sensor = sc->sc_info[i].sensor = i;
Index: src/sys/dev/acpi/acpica/Osd/OsdInterrupt.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpica/Osd/OsdInterrupt.c,v
retrieving revision 1.4
diff -u -u -p -r1.4 OsdInterrupt.c
--- src/sys/dev/acpi/acpica/Osd/OsdInterrupt.c	5 Mar 2003 23:00:57 -0000	1.4
+++ src/sys/dev/acpi/acpica/Osd/OsdInterrupt.c	9 Mar 2004 18:58:59 -0000
@@ -74,7 +74,7 @@ struct acpi_interrupt_handler {
 
 LIST_HEAD(, acpi_interrupt_handler) acpi_interrupt_list =
     LIST_HEAD_INITIALIZER(&acpi_interrupt_list);
-struct simplelock acpi_interrupt_list_slock = SIMPLELOCK_INITIALIZER;
+struct simplelock acpi_interrupt_list_slock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 
 #define	ACPI_INTERRUPT_LIST_LOCK(s)					\
 do {									\
Index: src/sys/dev/acpi/acpica/Osd/OsdSynch.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpica/Osd/OsdSynch.c,v
retrieving revision 1.6
diff -u -u -p -r1.6 OsdSynch.c
--- src/sys/dev/acpi/acpica/Osd/OsdSynch.c	31 Oct 2003 20:52:30 -0000	1.6
+++ src/sys/dev/acpi/acpica/Osd/OsdSynch.c	9 Mar 2004 18:58:59 -0000
@@ -120,7 +120,7 @@ AcpiOsCreateSemaphore(UINT32 MaxUnits, U
 	if (as == NULL)
 		return_ACPI_STATUS(AE_NO_MEMORY);
 
-	simple_lock_init(&as->as_slock);
+	simple_lock_init(&as->as_slock, IPL_NONE/*XXXUNVERIFIED*/);
 	as->as_units = InitialUnits;
 	as->as_maxunits = MaxUnits;
 
@@ -265,7 +265,7 @@ AcpiOsCreateLock(ACPI_HANDLE *OutHandle)
 	if (al == NULL)
 		return_ACPI_STATUS(AE_NO_MEMORY);
 
-	simple_lock_init(&al->al_slock);
+	simple_lock_init(&al->al_slock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
 	    "created lock %p\n", al));
Index: src/sys/dev/ata/ld_ataraid.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ata/ld_ataraid.c,v
retrieving revision 1.10
diff -u -u -p -r1.10 ld_ataraid.c
--- src/sys/dev/ata/ld_ataraid.c	25 Jan 2004 18:06:48 -0000	1.10
+++ src/sys/dev/ata/ld_ataraid.c	9 Mar 2004 18:58:59 -0000
@@ -128,7 +128,7 @@ ld_ataraid_attach(struct device *parent,
 	if (ld_ataraid_initialized == 0) {
 		ld_ataraid_initialized = 1;
 		pool_init(&ld_ataraid_cbufpl, sizeof(struct cbuf), 0,
-		    0, 0, "ldcbuf", NULL);
+		    0, 0, "ldcbuf", NULL, IPL_BIO);
 	}
 
 	sc->sc_aai = aai;	/* this data persists */
Index: src/sys/dev/ata/wd.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ata/wd.c,v
retrieving revision 1.274
diff -u -u -p -r1.274 wd.c
--- src/sys/dev/ata/wd.c	28 Feb 2004 06:28:47 -0000	1.274
+++ src/sys/dev/ata/wd.c	9 Mar 2004 18:59:01 -0000
@@ -1693,7 +1693,7 @@ wi_get(void)
 	int s;
 
 	wi = malloc(sizeof(struct wd_ioctl), M_TEMP, M_WAITOK|M_ZERO);
-	simple_lock_init(&wi->wi_bp.b_interlock);
+	simple_lock_init(&wi->wi_bp.b_interlock, IPL_BIO);
 	s = splbio();
 	LIST_INSERT_HEAD(&wi_head, wi, wi_list);
 	splx(s);
Index: src/sys/dev/dmover/dmover_backend.c
===================================================================
RCS file: /cvsroot/src/sys/dev/dmover/dmover_backend.c,v
retrieving revision 1.5
diff -u -u -p -r1.5 dmover_backend.c
--- src/sys/dev/dmover/dmover_backend.c	26 Apr 2003 04:44:18 -0000	1.5
+++ src/sys/dev/dmover/dmover_backend.c	9 Mar 2004 18:59:01 -0000
@@ -74,7 +74,7 @@ do {									\
 } while (/*CONSTCOND*/0)
 
 static int initialized;
-static struct simplelock initialized_slock = SIMPLELOCK_INITIALIZER;
+static struct simplelock initialized_slock = SIMPLELOCK_INITIALIZER(IPL_NONE);
 
 static void
 initialize(void)
Index: src/sys/dev/dmover/dmover_io.c
===================================================================
RCS file: /cvsroot/src/sys/dev/dmover/dmover_io.c,v
retrieving revision 1.13
diff -u -u -p -r1.13 dmover_io.c
--- src/sys/dev/dmover/dmover_io.c	13 Sep 2003 08:32:12 -0000	1.13
+++ src/sys/dev/dmover/dmover_io.c	9 Mar 2004 18:59:02 -0000
@@ -122,9 +122,9 @@ dmoverioattach(int count)
 {
 
 	pool_init(&dmio_state_pool, sizeof(struct dmio_state),
-	    0, 0, 0, "dmiostate", NULL);
+	    0, 0, 0, "dmiostate", NULL, IPL_SOFTCLOCK);
 	pool_init(&dmio_usrreq_state_pool, sizeof(struct dmio_usrreq_state),
-	    0, 0, 0, "dmiourstate", NULL);
+	    0, 0, 0, "dmiourstate", NULL, IPL_SOFTCLOCK);
 }
 
 /*
@@ -737,6 +737,7 @@ dmoverioopen(dev_t dev, int flag, int mo
 	memset(ds, 0, sizeof(*ds));
 	TAILQ_INIT(&ds->ds_pending);
 	TAILQ_INIT(&ds->ds_complete);
+	simple_lock_init(&ds->ds_slock, IPL_SOFTCLOCK);
 
 	fp->f_flag = FREAD | FWRITE;
 	fp->f_type = DTYPE_MISC;
Index: src/sys/dev/dmover/dmover_process.c
===================================================================
RCS file: /cvsroot/src/sys/dev/dmover/dmover_process.c,v
retrieving revision 1.2
diff -u -u -p -r1.2 dmover_process.c
--- src/sys/dev/dmover/dmover_process.c	6 Mar 2003 21:32:59 -0000	1.2
+++ src/sys/dev/dmover/dmover_process.c	9 Mar 2004 18:59:02 -0000
@@ -67,7 +67,7 @@ dmover_process_initialize(void)
 {
 
 	TAILQ_INIT(&dmover_completed_q);
-	simple_lock_init(&dmover_completed_q_slock);
+	simple_lock_init(&dmover_completed_q_slock, IPL_BIO);
 
 	dmover_completed_si = softintr_establish(IPL_SOFTCLOCK,
 	    dmover_complete, NULL);
Index: src/sys/dev/dmover/dmover_request.c
===================================================================
RCS file: /cvsroot/src/sys/dev/dmover/dmover_request.c,v
retrieving revision 1.1
diff -u -u -p -r1.1 dmover_request.c
--- src/sys/dev/dmover/dmover_request.c	2 Aug 2002 00:30:39 -0000	1.1
+++ src/sys/dev/dmover/dmover_request.c	9 Mar 2004 18:59:02 -0000
@@ -54,7 +54,7 @@ struct pool dmover_request_pool;
 struct pool_cache dmover_request_cache;
 
 static int initialized;
-static struct simplelock initialized_slock = SIMPLELOCK_INITIALIZER;
+static struct simplelock initialized_slock = SIMPLELOCK_INITIALIZER(IPL_BIO);
 
 void
 dmover_request_initialize(void)
@@ -65,7 +65,7 @@ dmover_request_initialize(void)
 	simple_lock(&initialized_slock);
 	if (__predict_true(initialized == 0)) {
 		pool_init(&dmover_request_pool, sizeof(struct dmover_request),
-		    0, 0, 0, "dmreq", NULL);
+		    0, 0, 0, "dmreq", NULL, IPL_BIO);
 		pool_cache_init(&dmover_request_cache, &dmover_request_pool,
 		    NULL, NULL, NULL);
 		initialized = 1;
Index: src/sys/dev/dmover/dmover_session.c
===================================================================
RCS file: /cvsroot/src/sys/dev/dmover/dmover_session.c,v
retrieving revision 1.1
diff -u -u -p -r1.1 dmover_session.c
--- src/sys/dev/dmover/dmover_session.c	2 Aug 2002 00:30:39 -0000	1.1
+++ src/sys/dev/dmover/dmover_session.c	9 Mar 2004 18:59:02 -0000
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: dmover_sessi
 struct pool dmover_session_pool;
 
 static int initialized;
-static struct simplelock initialized_slock = SIMPLELOCK_INITIALIZER;
+static struct simplelock initialized_slock = SIMPLELOCK_INITIALIZER(IPL_NONE);
 
 void
 dmover_session_initialize(void)
@@ -62,7 +62,7 @@ dmover_session_initialize(void)
 	simple_lock(&initialized_slock);
 	if (__predict_true(initialized == 0)) {
 		pool_init(&dmover_session_pool, sizeof(struct dmover_session),
-		    0, 0, 0, "dmses", &pool_allocator_nointr);
+		    0, 0, 0, "dmses", &pool_allocator_nointr, IPL_NONE);
 		initialized = 1;
 	}
 	simple_unlock(&initialized_slock);
Index: src/sys/dev/ic/atppc.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ic/atppc.c,v
retrieving revision 1.15
diff -u -u -p -r1.15 atppc.c
--- src/sys/dev/ic/atppc.c	24 Feb 2004 17:41:09 -0000	1.15
+++ src/sys/dev/ic/atppc.c	9 Mar 2004 18:59:05 -0000
@@ -188,7 +188,7 @@ atppc_sc_attach(struct atppc_softc *lsc)
 
 #if defined (MULTIPROCESSOR) || defined (LOCKDEBUG)
 	/* Initialize lock structure */
-	simple_lock_init(&(lsc->sc_lock));
+	simple_lock_init(&(lsc->sc_lock), IPL_NONE/*XXXUNVERIFIED*/);
 #endif
 
 	/* Set up parport_adapter structure */
Index: src/sys/dev/ic/com.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ic/com.c,v
retrieving revision 1.224
diff -u -u -p -r1.224 com.c
--- src/sys/dev/ic/com.c	23 Jan 2004 05:01:19 -0000	1.224
+++ src/sys/dev/ic/com.c	9 Mar 2004 18:59:07 -0000
@@ -430,7 +430,7 @@ com_attach_subr(struct com_softc *sc)
 
 	callout_init(&sc->sc_diag_callout);
 #if (defined(MULTIPROCESSOR) || defined(LOCKDEBUG)) && defined(COM_MPLOCK)
-	simple_lock_init(&sc->sc_lock);
+	simple_lock_init(&sc->sc_lock, IPL_SERIAL);
 #endif
 
 	/* Disable interrupts before configuring the device. */
Index: src/sys/dev/ic/lcdkp_subr.h
===================================================================
RCS file: /cvsroot/src/sys/dev/ic/lcdkp_subr.h,v
retrieving revision 1.2
diff -u -u -p -r1.2 lcdkp_subr.h
--- src/sys/dev/ic/lcdkp_subr.h	23 Jun 2003 11:01:58 -0000	1.2
+++ src/sys/dev/ic/lcdkp_subr.h	9 Mar 2004 18:59:07 -0000
@@ -66,7 +66,7 @@ struct lcdkp_chip {
 #define lcdkp_lock(sc)		simple_lock(&(sc)->sc_lock)
 #define lcdkp_unlock(sc)	simple_unlock(&(sc)->sc_lock)
 #define lcdkp_lockaddr(sc)	(&(sc)->sc_lock)
-#define lcdkp_lock_init(sc)	simple_lock_init(&(sc)->sc_lock)
+#define lcdkp_lock_init(sc)	simple_lock_init(&(sc)->sc_lock, IPL_NONE/*XXXUNVERIFIED*/)
 #else
 #define lcdkp_lock(sc)		((void)0)
 #define lcdkp_unlock(sc)	((void)0)
Index: src/sys/dev/ic/ncr53c9x.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ic/ncr53c9x.c,v
retrieving revision 1.110
diff -u -u -p -r1.110 ncr53c9x.c
--- src/sys/dev/ic/ncr53c9x.c	2 Nov 2003 11:07:45 -0000	1.110
+++ src/sys/dev/ic/ncr53c9x.c	9 Mar 2004 18:59:09 -0000
@@ -200,7 +200,7 @@ ncr53c9x_attach(sc)
 	struct scsipi_adapter *adapt = &sc->sc_adapter;
 	struct scsipi_channel *chan = &sc->sc_channel;
 
-	simple_lock_init(&sc->sc_lock);
+	simple_lock_init(&sc->sc_lock, IPL_BIO);
 
 	/*
 	 * Note, the front-end has set us up to print the chip variation.
@@ -443,7 +443,7 @@ ncr53c9x_init(sc, doreset)
 	if (!ecb_pool_initialized) {
 		/* All instances share this pool */
 		pool_init(&ecb_pool, sizeof(struct ncr53c9x_ecb), 0, 0, 0,
-		    "ncr53c9x_ecb", NULL);
+		    "ncr53c9x_ecb", NULL, IPL_BIO);
 		ecb_pool_initialized = 1;
 	}
 
Index: src/sys/dev/ic/wdc.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ic/wdc.c,v
retrieving revision 1.171
diff -u -u -p -r1.171 wdc.c
--- src/sys/dev/ic/wdc.c	7 Jan 2004 22:03:56 -0000	1.171
+++ src/sys/dev/ic/wdc.c	9 Mar 2004 18:59:12 -0000
@@ -173,7 +173,7 @@ int wdc_nxfer = 0;
  */
 struct atabus_initq_head atabus_initq_head =
     TAILQ_HEAD_INITIALIZER(atabus_initq_head);
-struct simplelock atabus_interlock = SIMPLELOCK_INITIALIZER;
+struct simplelock atabus_interlock = SIMPLELOCK_INITIALIZER(IPL_NONE);
 
 /* Test to see controller with at last one attached drive is there.
  * Returns a bit for each possible drive found (0x01 for drive 0,
@@ -668,7 +668,7 @@ wdcattach(struct wdc_channel *chp)
 	if (inited == 0) {
 		/* Initialize the ata_xfer pool. */
 		pool_init(&wdc_xfer_pool, sizeof(struct ata_xfer), 0,
-		    0, 0, "wdcspl", NULL);
+		    0, 0, "wdcspl", NULL, IPL_BIO);
 		inited++;
 	}
 	TAILQ_INIT(&chp->ch_queue->queue_xfer);
Index: src/sys/dev/ieee1394/sbp2.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ieee1394/sbp2.c,v
retrieving revision 1.18
diff -u -u -p -r1.18 sbp2.c
--- src/sys/dev/ieee1394/sbp2.c	29 Jun 2003 22:30:18 -0000	1.18
+++ src/sys/dev/ieee1394/sbp2.c	9 Mar 2004 18:59:13 -0000
@@ -90,11 +90,11 @@ static void sbp2_agent_status(struct iee
 
 static CIRCLEQ_HEAD(, sbp2_orb) sbp2_freeorbs =
     CIRCLEQ_HEAD_INITIALIZER(sbp2_freeorbs);
-static struct simplelock sbp2_freeorbs_lock = SIMPLELOCK_INITIALIZER;
+static struct simplelock sbp2_freeorbs_lock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 static struct sbp2_orb status_orb;
 static TAILQ_HEAD(, sbp2_map) sbp2_maps =
     TAILQ_HEAD_INITIALIZER(sbp2_maps);
-static struct simplelock sbp2_maps_lock = SIMPLELOCK_INITIALIZER;
+static struct simplelock sbp2_maps_lock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 
 #ifdef SBP2_DEBUG
 #define DPRINTF(x)      if (sbp2debug) printf x
@@ -192,7 +192,7 @@ sbp2_init(struct ieee1394_softc *sc, str
 	sbp2->sc = sc;
 	sc->sc1394_callback.sc1394_reset = sbp2_relogin;
 	sc->sc1394_callback.sc1394_resetarg = sbp2;
-	simple_lock_init(&sbp2->orblist_lock);
+	simple_lock_init(&sbp2->orblist_lock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	found = 0;
 	simple_lock(&sbp2_maps_lock);
@@ -211,7 +211,7 @@ sbp2_init(struct ieee1394_softc *sc, str
 	if (!found) {
 		sbp2_map = malloc(sizeof (struct sbp2_map), M_1394DATA,
 		    M_WAITOK|M_ZERO);
-		simple_lock_init(&sbp2_map->maplock);
+		simple_lock_init(&sbp2_map->maplock, IPL_NONE/*XXXUNVERIFIED*/);
 		simple_lock(&sbp2_map->maplock);
 		simple_lock(&sbp2_maps_lock);
 		TAILQ_INSERT_TAIL(&sbp2_maps, sbp2_map, map_list);
@@ -1157,7 +1157,7 @@ sbp2_alloc_orb(void)
 			    M_WAITOK|M_ZERO);
 			orb->cmd.ab_data = malloc(SBP2_MAX_ORB, M_1394DATA,
 			    M_WAITOK|M_ZERO);
-			simple_lock_init(&orb->orb_lock);
+			simple_lock_init(&orb->orb_lock, IPL_NONE/*XXXUNVERIFIED*/);
 			simple_lock(&sbp2_freeorbs_lock);
 			CIRCLEQ_INSERT_TAIL(&sbp2_freeorbs, orb, orb_list);
 		}
@@ -1166,7 +1166,7 @@ sbp2_alloc_orb(void)
 		    M_WAITOK|M_ZERO);
 		orb->cmd.ab_data = malloc(SBP2_MAX_ORB, M_1394DATA,
 		    M_WAITOK|M_ZERO);
-		simple_lock_init(&orb->orb_lock);
+		simple_lock_init(&orb->orb_lock, IPL_NONE/*XXXUNVERIFIED*/);
 		return orb;
 	} else {
 		orb = CIRCLEQ_FIRST(&sbp2_freeorbs);
Index: src/sys/dev/mca/ed_mca.c
===================================================================
RCS file: /cvsroot/src/sys/dev/mca/ed_mca.c,v
retrieving revision 1.22
diff -u -u -p -r1.22 ed_mca.c
--- src/sys/dev/mca/ed_mca.c	29 Jun 2003 22:30:22 -0000	1.22
+++ src/sys/dev/mca/ed_mca.c	9 Mar 2004 18:59:14 -0000
@@ -165,7 +165,7 @@ ed_mca_attach(parent, self, aux)
 	edc_add_disk(sc, ed);
 
 	bufq_alloc(&ed->sc_q, BUFQ_DISKSORT|BUFQ_SORT_RAWBLOCK);
-	simple_lock_init(&ed->sc_q_lock);
+	simple_lock_init(&ed->sc_q_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	snprintf(lckname, sizeof(lckname), "%slck", ed->sc_dev.dv_xname);
 	lockinit(&ed->sc_lock, PRIBIO | PCATCH, lckname, 0, 0);
 
Index: src/sys/dev/pci/cy82c693.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/cy82c693.c,v
retrieving revision 1.3
diff -u -u -p -r1.3 cy82c693.c
--- src/sys/dev/pci/cy82c693.c	13 Nov 2001 07:35:02 -0000	1.3
+++ src/sys/dev/pci/cy82c693.c	9 Mar 2004 18:59:15 -0000
@@ -63,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: cy82c693.c,v
 static struct cy82c693_handle cyhc_handle;
 static int cyhc_initialized;
 
-static struct simplelock cyhc_slock = SIMPLELOCK_INITIALIZER;
+static struct simplelock cyhc_slock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 
 #define	CYHC_LOCK(s)							\
 do {									\
Index: src/sys/dev/pci/viaenv.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/viaenv.c,v
retrieving revision 1.9
diff -u -u -p -r1.9 viaenv.c
--- src/sys/dev/pci/viaenv.c	2 Oct 2002 16:51:59 -0000	1.9
+++ src/sys/dev/pci/viaenv.c	9 Mar 2004 18:59:15 -0000
@@ -291,7 +291,7 @@ viaenv_attach(struct device * parent, st
 	}
 	printf("\n");
 
-	simple_lock_init(&sc->sc_slock);
+	simple_lock_init(&sc->sc_slock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	/* Initialize sensors */
 	for (i = 0; i < VIANUMSENSORS; ++i) {
Index: src/sys/dev/raidframe/rf_alloclist.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_alloclist.c,v
retrieving revision 1.19
diff -u -u -p -r1.19 rf_alloclist.c
--- src/sys/dev/raidframe/rf_alloclist.c	5 Mar 2004 02:53:55 -0000	1.19
+++ src/sys/dev/raidframe/rf_alloclist.c	9 Mar 2004 18:59:16 -0000
@@ -67,7 +67,7 @@ rf_ConfigureAllocList(RF_ShutdownList_t 
 {
 
 	pool_init(&rf_alloclist_pool, sizeof(RF_AllocListElem_t),
-		  0, 0, 0, "rf_alloclist_pl", NULL);
+		  0, 0, 0, "rf_alloclist_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&rf_alloclist_pool, RF_AL_FREELIST_MAX);
 	pool_prime(&rf_alloclist_pool, RF_AL_FREELIST_MIN);
 	pool_setlowat(&rf_alloclist_pool, RF_AL_FREELIST_MIN);
Index: src/sys/dev/raidframe/rf_callback.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_callback.c,v
retrieving revision 1.14
diff -u -u -p -r1.14 rf_callback.c
--- src/sys/dev/raidframe/rf_callback.c	5 Mar 2004 02:53:58 -0000	1.14
+++ src/sys/dev/raidframe/rf_callback.c	9 Mar 2004 18:59:16 -0000
@@ -63,7 +63,7 @@ rf_ConfigureCallback(listp)
 {
 
 	pool_init(&rf_callback_pool, sizeof(RF_CallbackDesc_t), 0, 0, 0,
-		  "rf_callbackpl", NULL);
+		  "rf_callbackpl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&rf_callback_pool, RF_MAX_FREE_CALLBACK);
 	pool_prime(&rf_callback_pool, RF_MIN_FREE_CALLBACK);
 	pool_setlowat(&rf_callback_pool, RF_MIN_FREE_CALLBACK);
Index: src/sys/dev/raidframe/rf_dagutils.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_dagutils.c,v
retrieving revision 1.35
diff -u -u -p -r1.35 rf_dagutils.c
--- src/sys/dev/raidframe/rf_dagutils.c	7 Mar 2004 02:25:36 -0000	1.35
+++ src/sys/dev/raidframe/rf_dagutils.c	9 Mar 2004 18:59:17 -0000
@@ -193,19 +193,19 @@ rf_ConfigureDAGs(RF_ShutdownList_t **lis
 {
 
 	pool_init(&rf_dagh_pool, sizeof(RF_DagHeader_t), 0, 0, 0,
-		  "rf_dagh_pl", NULL);
+		  "rf_dagh_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&rf_dagh_pool, RF_MAX_FREE_DAGH);
 	pool_prime(&rf_dagh_pool, RF_MIN_FREE_DAGH);
 	pool_setlowat(&rf_dagh_pool, RF_MIN_FREE_DAGH);
 
 	pool_init(&rf_daglist_pool, sizeof(RF_DagList_t), 0, 0, 0,
-		  "rf_daglist_pl", NULL);
+		  "rf_daglist_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&rf_daglist_pool, RF_MAX_FREE_DAGLIST);
 	pool_prime(&rf_daglist_pool, RF_MIN_FREE_DAGLIST);
 	pool_setlowat(&rf_daglist_pool, RF_MIN_FREE_DAGLIST);
 
 	pool_init(&rf_funclist_pool, sizeof(RF_FuncList_t), 0, 0, 0,
-		  "rf_funcist_pl", NULL);
+		  "rf_funcist_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&rf_funclist_pool, RF_MAX_FREE_FUNCLIST);
 	pool_prime(&rf_funclist_pool, RF_MIN_FREE_FUNCLIST);
 	pool_setlowat(&rf_funclist_pool, RF_MIN_FREE_FUNCLIST);
Index: src/sys/dev/raidframe/rf_diskqueue.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_diskqueue.c,v
retrieving revision 1.31
diff -u -u -p -r1.31 rf_diskqueue.c
--- src/sys/dev/raidframe/rf_diskqueue.c	5 Mar 2004 02:53:55 -0000	1.31
+++ src/sys/dev/raidframe/rf_diskqueue.c	9 Mar 2004 18:59:18 -0000
@@ -190,7 +190,7 @@ rf_ConfigureDiskQueueSystem(RF_ShutdownL
 {
 
 	pool_init(&rf_dqd_pool, sizeof(RF_DiskQueueData_t), 0, 0, 0,
-		  "rf_dqd_pl", NULL);
+		  "rf_dqd_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&rf_dqd_pool, RF_MAX_FREE_DQD);
 	pool_prime(&rf_dqd_pool, RF_MIN_FREE_DQD);
 	pool_setlowat(&rf_dqd_pool, RF_MIN_FREE_DQD);
Index: src/sys/dev/raidframe/rf_driver.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_driver.c,v
retrieving revision 1.88
diff -u -u -p -r1.88 rf_driver.c
--- src/sys/dev/raidframe/rf_driver.c	5 Mar 2004 02:53:56 -0000	1.88
+++ src/sys/dev/raidframe/rf_driver.c	9 Mar 2004 18:59:19 -0000
@@ -342,7 +342,7 @@ rf_Configure(RF_Raid_t *raidPtr, RF_Conf
 	raidPtr->reconControl = NULL;
 	
 	TAILQ_INIT(&(raidPtr->iodone));
-	simple_lock_init(&(raidPtr->iodone_lock));
+	simple_lock_init(&(raidPtr->iodone_lock), IPL_NONE/*XXXUNVERIFIED*/);
 
 	DO_RAID_INIT_CONFIGURE(rf_ConfigureEngine);
 	DO_RAID_INIT_CONFIGURE(rf_ConfigureStripeLocks);
@@ -433,13 +433,13 @@ rf_ConfigureRDFreeList(RF_ShutdownList_t
 {
 
 	pool_init(&rf_rad_pool, sizeof(RF_RaidAccessDesc_t), 0, 0, 0,
-		  "rf_rad_pl", NULL);
+		  "rf_rad_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&rf_rad_pool, RF_MAX_FREE_RAD);
 	pool_prime(&rf_rad_pool, RF_MIN_FREE_RAD);
 	pool_setlowat(&rf_rad_pool, RF_MIN_FREE_RAD);
 
 	rf_ShutdownCreate(listp, rf_ShutdownRDFreeList, NULL);
-	simple_lock_init(&rf_rad_pool_lock);
+	simple_lock_init(&rf_rad_pool_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	return (0);
 }
 
@@ -452,7 +452,7 @@ rf_AllocRaidAccDesc(RF_Raid_t *raidPtr, 
 	RF_RaidAccessDesc_t *desc;
 
 	desc = pool_get(&rf_rad_pool, PR_WAITOK);
-	simple_lock_init(&desc->mutex);
+	simple_lock_init(&desc->mutex, IPL_NONE/*XXXUNVERIFIED*/);
 
 	RF_LOCK_MUTEX(rf_rad_pool_lock);
 	if (raidPtr->waitShutdown) {
Index: src/sys/dev/raidframe/rf_map.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_map.c,v
retrieving revision 1.31
diff -u -u -p -r1.31 rf_map.c
--- src/sys/dev/raidframe/rf_map.c	7 Mar 2004 02:59:25 -0000	1.31
+++ src/sys/dev/raidframe/rf_map.c	9 Mar 2004 18:59:20 -0000
@@ -344,19 +344,19 @@ rf_ConfigureMapModule(RF_ShutdownList_t 
 {
 
 	pool_init(&rf_asmhdr_pool, sizeof(RF_AccessStripeMapHeader_t),
-		  0, 0, 0, "rf_asmhdr_pl", NULL);
+		  0, 0, 0, "rf_asmhdr_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&rf_asmhdr_pool, RF_MAX_FREE_ASMHDR);
 	pool_prime(&rf_asmhdr_pool, RF_MIN_FREE_ASMHDR);
 	pool_setlowat(&rf_asmhdr_pool, RF_MIN_FREE_ASMHDR);
 
 	pool_init(&rf_asm_pool, sizeof(RF_AccessStripeMap_t),
-		  0, 0, 0, "rf_asm_pl", NULL);	
+		  0, 0, 0, "rf_asm_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);	
 	pool_sethiwat(&rf_asm_pool, RF_MAX_FREE_ASM);
 	pool_prime(&rf_asm_pool, RF_MIN_FREE_ASM);
 	pool_setlowat(&rf_asm_pool, RF_MIN_FREE_ASM);
 
 	pool_init(&rf_pda_pool, sizeof(RF_PhysDiskAddr_t),
-		  0, 0, 0, "rf_pda_pl", NULL);
+		  0, 0, 0, "rf_pda_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&rf_pda_pool, RF_MAX_FREE_PDA);
 	pool_prime(&rf_pda_pool, RF_MIN_FREE_PDA);
 	pool_setlowat(&rf_pda_pool, RF_MIN_FREE_PDA);
Index: src/sys/dev/raidframe/rf_mcpair.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_mcpair.c,v
retrieving revision 1.16
diff -u -u -p -r1.16 rf_mcpair.c
--- src/sys/dev/raidframe/rf_mcpair.c	5 Mar 2004 02:53:58 -0000	1.16
+++ src/sys/dev/raidframe/rf_mcpair.c	9 Mar 2004 18:59:20 -0000
@@ -63,7 +63,7 @@ rf_ConfigureMCPair(RF_ShutdownList_t **l
 {
 
 	pool_init(&rf_mcpair_pool, sizeof(RF_MCPair_t), 0, 0, 0,
-		  "rf_mcpair_pl", NULL);
+		  "rf_mcpair_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&rf_mcpair_pool, RF_MAX_FREE_MCPAIR);
 	pool_prime(&rf_mcpair_pool, RF_MIN_FREE_MCPAIR);
 	pool_setlowat(&rf_mcpair_pool, RF_MIN_FREE_MCPAIR);
@@ -79,7 +79,7 @@ rf_AllocMCPair()
 	RF_MCPair_t *t;
 
 	t = pool_get(&rf_mcpair_pool, PR_WAITOK);
-	simple_lock_init(&t->mutex);
+	simple_lock_init(&t->mutex, IPL_NONE/*XXXUNVERIFIED*/);
 	t->cond = 0;
 	t->flag = 0;
 
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_netbsdkintf.c,v
retrieving revision 1.176
diff -u -u -p -r1.176 rf_netbsdkintf.c
--- src/sys/dev/raidframe/rf_netbsdkintf.c	5 Mar 2004 02:53:58 -0000	1.176
+++ src/sys/dev/raidframe/rf_netbsdkintf.c	9 Mar 2004 18:59:23 -0000
@@ -362,7 +362,7 @@ raidattach(int num)
 
 	/* Initialize the component buffer pool. */
 	pool_init(&raidframe_cbufpool, sizeof(struct raidbuf), 0,
-	    0, 0, "raidpl", NULL);
+	    0, 0, "raidpl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_prime(&raidframe_cbufpool, num * RAIDOUTSTANDING);
 	pool_setlowat(&raidframe_cbufpool, num * RAIDOUTSTANDING);
 
Index: src/sys/dev/raidframe/rf_psstatus.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_psstatus.c,v
retrieving revision 1.25
diff -u -u -p -r1.25 rf_psstatus.c
--- src/sys/dev/raidframe/rf_psstatus.c	5 Mar 2004 02:53:58 -0000	1.25
+++ src/sys/dev/raidframe/rf_psstatus.c	9 Mar 2004 18:59:23 -0000
@@ -82,14 +82,14 @@ rf_ConfigurePSStatus(RF_ShutdownList_t *
 
 	raidPtr->pssTableSize = RF_PSS_DEFAULT_TABLESIZE;
 	pool_init(&raidPtr->pss_pool, sizeof(RF_ReconParityStripeStatus_t), 0,
-		  0, 0, "raidpsspl", NULL);
+		  0, 0, "raidpsspl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&raidPtr->pss_pool, RF_MAX_FREE_PSS);
 	pool_prime(&raidPtr->pss_pool, RF_MIN_FREE_PSS);
 	pool_setlowat(&raidPtr->pss_pool, RF_MIN_FREE_PSS);
 
 	pool_init(&raidPtr->pss_issued_pool,
 		  raidPtr->numCol * sizeof(char), 0,
-		  0, 0, "raidpssissuedpl", NULL);
+		  0, 0, "raidpssissuedpl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&raidPtr->pss_issued_pool, RF_MAX_FREE_PSS);
 	pool_prime(&raidPtr->pss_issued_pool, RF_MIN_FREE_PSS);
 	pool_setlowat(&raidPtr->pss_issued_pool, RF_MIN_FREE_PSS);
Index: src/sys/dev/raidframe/rf_reconmap.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_reconmap.c,v
retrieving revision 1.23
diff -u -u -p -r1.23 rf_reconmap.c
--- src/sys/dev/raidframe/rf_reconmap.c	1 Mar 2004 01:12:22 -0000	1.23
+++ src/sys/dev/raidframe/rf_reconmap.c	9 Mar 2004 18:59:24 -0000
@@ -108,7 +108,7 @@ rf_MakeReconMap(RF_Raid_t *raidPtr, RF_S
 
 	
 	pool_init(&p->elem_pool, sizeof(RF_ReconMapListElem_t), 0,
-	    0, 0, "raidreconpl", NULL);
+	    0, 0, "raidreconpl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_prime(&p->elem_pool, RF_NUM_RECON_POOL_ELEM);
 
 	rf_mutex_init(&p->mutex);
Index: src/sys/dev/raidframe/rf_reconstruct.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_reconstruct.c,v
retrieving revision 1.73
diff -u -u -p -r1.73 rf_reconstruct.c
--- src/sys/dev/raidframe/rf_reconstruct.c	7 Mar 2004 02:46:58 -0000	1.73
+++ src/sys/dev/raidframe/rf_reconstruct.c	9 Mar 2004 18:59:25 -0000
@@ -153,13 +153,13 @@ rf_ConfigureReconstruction(RF_ShutdownLi
 {
 
 	pool_init(&rf_recond_pool, sizeof(RF_RaidReconDesc_t), 0, 0, 0,
-		  "rf_recond_pl", NULL);
+		  "rf_recond_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&rf_recond_pool,RF_MAX_FREE_RECOND);
 	pool_prime(&rf_recond_pool,RF_MIN_FREE_RECOND);
 	pool_sethiwat(&rf_recond_pool,RF_MIN_FREE_RECOND);
 
 	pool_init(&rf_reconbuffer_pool, sizeof(RF_ReconBuffer_t), 0, 0, 0,
-		  "rf_reconbuffer_pl", NULL);
+		  "rf_reconbuffer_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&rf_reconbuffer_pool,RF_MAX_FREE_RECONBUFFER);
 	pool_prime(&rf_reconbuffer_pool,RF_MIN_FREE_RECONBUFFER);
 	pool_sethiwat(&rf_reconbuffer_pool,RF_MIN_FREE_RECONBUFFER);
Index: src/sys/dev/raidframe/rf_reconutil.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_reconutil.c,v
retrieving revision 1.21
diff -u -u -p -r1.21 rf_reconutil.c
--- src/sys/dev/raidframe/rf_reconutil.c	7 Mar 2004 02:46:59 -0000	1.21
+++ src/sys/dev/raidframe/rf_reconutil.c	9 Mar 2004 18:59:26 -0000
@@ -123,13 +123,13 @@ rf_MakeReconControl(RF_RaidReconDesc_t *
 	}
 
 	/* initialize the event queue */
-	simple_lock_init(&reconCtrlPtr->eq_mutex);
+	simple_lock_init(&reconCtrlPtr->eq_mutex, IPL_NONE/*XXXUNVERIFIED*/);
 
 	reconCtrlPtr->eventQueue = NULL;
 	reconCtrlPtr->eq_count = 0;
 
 	/* make the floating recon buffers and append them to the free list */
-	simple_lock_init(&reconCtrlPtr->rb_mutex);
+	simple_lock_init(&reconCtrlPtr->rb_mutex, IPL_NONE/*XXXUNVERIFIED*/);
 
 	reconCtrlPtr->fullBufferList = NULL;
 	reconCtrlPtr->floatingRbufs = NULL;
Index: src/sys/dev/raidframe/rf_revent.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_revent.c,v
retrieving revision 1.17
diff -u -u -p -r1.17 rf_revent.c
--- src/sys/dev/raidframe/rf_revent.c	2 Mar 2004 16:03:00 -0000	1.17
+++ src/sys/dev/raidframe/rf_revent.c	9 Mar 2004 18:59:26 -0000
@@ -66,7 +66,7 @@ rf_ConfigureReconEvent(RF_ShutdownList_t
 {
 
 	pool_init(&rf_revent_pool, sizeof(RF_ReconEvent_t),
-		  0, 0, 0, "rf_revent_pl", NULL);
+		  0, 0, 0, "rf_revent_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&rf_revent_pool, RF_MAX_FREE_REVENT);
 	pool_prime(&rf_revent_pool, RF_REVENT_INITIAL);
 
Index: src/sys/dev/raidframe/rf_stripelocks.c
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_stripelocks.c,v
retrieving revision 1.24
diff -u -u -p -r1.24 rf_stripelocks.c
--- src/sys/dev/raidframe/rf_stripelocks.c	5 Mar 2004 02:53:58 -0000	1.24
+++ src/sys/dev/raidframe/rf_stripelocks.c	9 Mar 2004 18:59:27 -0000
@@ -170,7 +170,7 @@ rf_ConfigureStripeLockFreeList(RF_Shutdo
 	unsigned mask;
 
 	pool_init(&rf_stripelock_pool, sizeof(RF_StripeLockDesc_t),
-		  0, 0, 0, "rf_stripelock_pl", NULL);
+		  0, 0, 0, "rf_stripelock_pl", NULL, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_sethiwat(&rf_stripelock_pool, RF_MAX_FREE_STRIPELOCK);
 	pool_prime(&rf_stripelock_pool, RF_MIN_FREE_STRIPELOCK);
 	pool_setlowat(&rf_stripelock_pool, RF_MIN_FREE_STRIPELOCK);
Index: src/sys/dev/raidframe/rf_threadstuff.h
===================================================================
RCS file: /cvsroot/src/sys/dev/raidframe/rf_threadstuff.h,v
retrieving revision 1.20
diff -u -u -p -r1.20 rf_threadstuff.h
--- src/sys/dev/raidframe/rf_threadstuff.h	29 Dec 2003 06:30:42 -0000	1.20
+++ src/sys/dev/raidframe/rf_threadstuff.h	9 Mar 2004 18:59:27 -0000
@@ -94,6 +94,6 @@ typedef void *RF_ThreadArg_t;
 	kthread_create1((void (*)(void *))(_func_), (void *)(_arg_), \
 	    (struct proc **)&(_handle_), _fmt_, _fmt_arg_)
 
-#define rf_mutex_init(m) simple_lock_init(m)
+#define rf_mutex_init(m) simple_lock_init(m, IPL_NONE/*XXXUNVERIFIED*/)
 
 #endif				/* !_RF__RF_THREADSTUFF_H_ */
Index: src/sys/dev/scsipi/scsiconf.c
===================================================================
RCS file: /cvsroot/src/sys/dev/scsipi/scsiconf.c,v
retrieving revision 1.219
diff -u -u -p -r1.219 scsiconf.c
--- src/sys/dev/scsipi/scsiconf.c	22 Feb 2004 07:26:15 -0000	1.219
+++ src/sys/dev/scsipi/scsiconf.c	9 Mar 2004 18:59:28 -0000
@@ -90,7 +90,7 @@ struct scsi_initq {
 
 static TAILQ_HEAD(, scsi_initq) scsi_initq_head = 
     TAILQ_HEAD_INITIALIZER(scsi_initq_head);
-static struct simplelock scsibus_interlock = SIMPLELOCK_INITIALIZER;
+static struct simplelock scsibus_interlock = SIMPLELOCK_INITIALIZER(IPL_NONE);
 
 int	scsi_probe_device __P((struct scsibus_softc *, int, int));
 
Index: src/sys/dev/scsipi/scsipi_base.c
===================================================================
RCS file: /cvsroot/src/sys/dev/scsipi/scsipi_base.c,v
retrieving revision 1.101
diff -u -u -p -r1.101 scsipi_base.c
--- src/sys/dev/scsipi/scsipi_base.c	3 Jan 2004 01:48:38 -0000	1.101
+++ src/sys/dev/scsipi/scsipi_base.c	9 Mar 2004 18:59:30 -0000
@@ -102,7 +102,7 @@ scsipi_init()
 
 	/* Initialize the scsipi_xfer pool. */
 	pool_init(&scsipi_xfer_pool, sizeof(struct scsipi_xfer), 0,
-	    0, 0, "scxspl", NULL);
+	    0, 0, "scxspl", NULL, IPL_BIO);
 }
 
 /*
Index: src/sys/dev/scsipi/scsipi_ioctl.c
===================================================================
RCS file: /cvsroot/src/sys/dev/scsipi/scsipi_ioctl.c,v
retrieving revision 1.46
diff -u -u -p -r1.46 scsipi_ioctl.c
--- src/sys/dev/scsipi/scsipi_ioctl.c	29 Jun 2003 22:30:41 -0000	1.46
+++ src/sys/dev/scsipi/scsipi_ioctl.c	9 Mar 2004 18:59:31 -0000
@@ -90,7 +90,7 @@ si_get()
 	int s;
 
 	si = malloc(sizeof(struct scsi_ioctl), M_TEMP, M_WAITOK|M_ZERO);
-	simple_lock_init(&si->si_bp.b_interlock);
+	BUF_INIT(&si->si_bp);
 	s = splbio();
 	LIST_INSERT_HEAD(&si_head, si, si_list);
 	splx(s);
Index: src/sys/dev/sysmon/sysmon_envsys.c
===================================================================
RCS file: /cvsroot/src/sys/dev/sysmon/sysmon_envsys.c,v
retrieving revision 1.8
diff -u -u -p -r1.8 sysmon_envsys.c
--- src/sys/dev/sysmon/sysmon_envsys.c	11 Aug 2003 15:07:14 -0000	1.8
+++ src/sys/dev/sysmon/sysmon_envsys.c	9 Mar 2004 18:59:31 -0000
@@ -63,11 +63,11 @@ struct lock sysmon_envsys_lock;
 
 LIST_HEAD(, sysmon_envsys) sysmon_envsys_list =
     LIST_HEAD_INITIALIZER(&sysmon_envsys_list);
-struct simplelock sysmon_envsys_list_slock = SIMPLELOCK_INITIALIZER;
+struct simplelock sysmon_envsys_list_slock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 u_int	sysmon_envsys_next_sensor_index;
 
 int	sysmon_envsys_initialized;
-struct simplelock sysmon_envsys_initialized_slock = SIMPLELOCK_INITIALIZER;
+struct simplelock sysmon_envsys_initialized_slock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 
 #define	SYSMON_ENVSYS_LOCK()	\
 	lockmgr(&sysmon_envsys_lock, LK_EXCLUSIVE, NULL)
Index: src/sys/dev/sysmon/sysmon_power.c
===================================================================
RCS file: /cvsroot/src/sys/dev/sysmon/sysmon_power.c,v
retrieving revision 1.8
diff -u -u -p -r1.8 sysmon_power.c
--- src/sys/dev/sysmon/sysmon_power.c	14 Jul 2003 15:47:28 -0000	1.8
+++ src/sys/dev/sysmon/sysmon_power.c	9 Mar 2004 18:59:31 -0000
@@ -58,14 +58,14 @@ __KERNEL_RCSID(0, "$NetBSD: sysmon_power
 static LIST_HEAD(, sysmon_pswitch) sysmon_pswitch_list =
     LIST_HEAD_INITIALIZER(sysmon_pswitch_list);
 static struct simplelock sysmon_pswitch_list_slock =
-    SIMPLELOCK_INITIALIZER;
+    SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 
 static struct proc *sysmon_power_daemon;
 
 #define	SYSMON_MAX_POWER_EVENTS		32
 
 static struct simplelock sysmon_power_event_queue_slock =
-    SIMPLELOCK_INITIALIZER;
+    SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 static power_event_t sysmon_power_event_queue[SYSMON_MAX_POWER_EVENTS];
 static int sysmon_power_event_queue_head;
 static int sysmon_power_event_queue_tail;
Index: src/sys/dev/sysmon/sysmon_taskq.c
===================================================================
RCS file: /cvsroot/src/sys/dev/sysmon/sysmon_taskq.c,v
retrieving revision 1.3
diff -u -u -p -r1.3 sysmon_taskq.c
--- src/sys/dev/sysmon/sysmon_taskq.c	6 Sep 2003 23:28:30 -0000	1.3
+++ src/sys/dev/sysmon/sysmon_taskq.c	9 Mar 2004 18:59:32 -0000
@@ -62,7 +62,7 @@ struct sysmon_task {
 
 static TAILQ_HEAD(, sysmon_task) sysmon_task_queue =
     TAILQ_HEAD_INITIALIZER(sysmon_task_queue);
-struct simplelock sysmon_task_queue_slock = SIMPLELOCK_INITIALIZER;
+struct simplelock sysmon_task_queue_slock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 
 #define	SYSMON_TASK_QUEUE_LOCK(s)					\
 do {									\
@@ -84,7 +84,7 @@ static void sysmon_task_queue_create_thr
 static void sysmon_task_queue_thread(void *);
 
 static struct simplelock sysmon_task_queue_initialized_slock =
-    SIMPLELOCK_INITIALIZER;
+    SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 static int sysmon_task_queue_initialized;
 
 /*
Index: src/sys/dev/sysmon/sysmon_wdog.c
===================================================================
RCS file: /cvsroot/src/sys/dev/sysmon/sysmon_wdog.c,v
retrieving revision 1.9
diff -u -u -p -r1.9 sysmon_wdog.c
--- src/sys/dev/sysmon/sysmon_wdog.c	30 Oct 2003 01:58:18 -0000	1.9
+++ src/sys/dev/sysmon/sysmon_wdog.c	9 Mar 2004 18:59:32 -0000
@@ -58,9 +58,9 @@ __KERNEL_RCSID(0, "$NetBSD: sysmon_wdog.
 LIST_HEAD(, sysmon_wdog) sysmon_wdog_list =
     LIST_HEAD_INITIALIZER(&sysmon_wdog_list);
 int sysmon_wdog_count;
-struct simplelock sysmon_wdog_list_slock = SIMPLELOCK_INITIALIZER;
+struct simplelock sysmon_wdog_list_slock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 
-struct simplelock sysmon_wdog_slock = SIMPLELOCK_INITIALIZER;
+struct simplelock sysmon_wdog_slock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 struct sysmon_wdog *sysmon_armed_wdog;
 struct callout sysmon_wdog_callout = CALLOUT_INITIALIZER;
 void *sysmon_wdog_sdhook;
Index: src/sys/fs/adosfs/advfsops.c
===================================================================
RCS file: /cvsroot/src/sys/fs/adosfs/advfsops.c,v
retrieving revision 1.9
diff -u -u -p -r1.9 advfsops.c
--- src/sys/fs/adosfs/advfsops.c	4 Dec 2003 19:38:23 -0000	1.9
+++ src/sys/fs/adosfs/advfsops.c	9 Mar 2004 18:59:33 -0000
@@ -812,10 +812,10 @@ adosfs_sync(mp, waitfor, uc, p)
 void
 adosfs_init()
 {
-	simple_lock_init(&adosfs_hashlock);
+	simple_lock_init(&adosfs_hashlock, IPL_NONE/*XXXUNVERIFIED*/);
 
 	pool_init(&adosfs_node_pool, sizeof(struct anode), 0, 0, 0,
-	    "adosndpl", &pool_allocator_nointr);
+	    "adosndpl", &pool_allocator_nointr, IPL_NONE);
 }
 
 void
Index: src/sys/fs/cd9660/cd9660_node.c
===================================================================
RCS file: /cvsroot/src/sys/fs/cd9660/cd9660_node.c,v
retrieving revision 1.5
diff -u -u -p -r1.5 cd9660_node.c
--- src/sys/fs/cd9660/cd9660_node.c	7 Aug 2003 16:31:34 -0000	1.5
+++ src/sys/fs/cd9660/cd9660_node.c	9 Mar 2004 18:59:34 -0000
@@ -86,13 +86,13 @@ cd9660_init()
 {
 	isohashtbl = hashinit(desiredvnodes, HASH_LIST, M_ISOFSMNT, M_WAITOK,
 	    &isohash);
-	simple_lock_init(&cd9660_ihash_slock);
+	simple_lock_init(&cd9660_ihash_slock, IPL_NONE/*XXXUNVERIFIED*/);
 #ifdef ISODEVMAP
 	idvhashtbl = hashinit(desiredvnodes / 8, HASH_LIST, M_ISOFSMNT,
 	    M_WAITOK, &idvhash);
 #endif
 	pool_init(&cd9660_node_pool, sizeof(struct iso_node), 0, 0, 0,
-	    "cd9660nopl", &pool_allocator_nointr);
+	    "cd9660nopl", &pool_allocator_nointr, IPL_NONE);
 }
 
 /*
Index: src/sys/fs/filecorefs/filecore_node.c
===================================================================
RCS file: /cvsroot/src/sys/fs/filecorefs/filecore_node.c,v
retrieving revision 1.2
diff -u -u -p -r1.2 filecore_node.c
--- src/sys/fs/filecorefs/filecore_node.c	7 Aug 2003 16:31:37 -0000	1.2
+++ src/sys/fs/filecorefs/filecore_node.c	9 Mar 2004 18:59:34 -0000
@@ -107,9 +107,9 @@ filecore_init()
 {
 	filecorehashtbl = hashinit(desiredvnodes, HASH_LIST, M_FILECOREMNT,
 	    M_WAITOK, &filecorehash);
-	simple_lock_init(&filecore_ihash_slock);
+	simple_lock_init(&filecore_ihash_slock, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_init(&filecore_node_pool, sizeof(struct filecore_node),
-	    0, 0, 0, "filecrnopl", &pool_allocator_nointr);
+	    0, 0, 0, "filecrnopl", &pool_allocator_nointr, IPL_NONE);
 }
 
 /*
Index: src/sys/fs/msdosfs/msdosfs_denode.c
===================================================================
RCS file: /cvsroot/src/sys/fs/msdosfs/msdosfs_denode.c,v
retrieving revision 1.4
diff -u -u -p -r1.4 msdosfs_denode.c
--- src/sys/fs/msdosfs/msdosfs_denode.c	29 Jun 2003 22:31:09 -0000	1.4
+++ src/sys/fs/msdosfs/msdosfs_denode.c	9 Mar 2004 18:59:34 -0000
@@ -96,9 +96,9 @@ msdosfs_init()
 {
 	dehashtbl = hashinit(desiredvnodes / 2, HASH_LIST, M_MSDOSFSMNT,
 	    M_WAITOK, &dehash);
-	simple_lock_init(&msdosfs_ihash_slock);
+	simple_lock_init(&msdosfs_ihash_slock, IPL_NONE/*XXXUNVERIFIED*/);
 	pool_init(&msdosfs_denode_pool, sizeof(struct denode), 0, 0, 0,
-	    "msdosnopl", &pool_allocator_nointr);
+	    "msdosnopl", &pool_allocator_nointr, IPL_NONE);
 }
 
 /*
Index: src/sys/fs/ntfs/ntfs_ihash.c
===================================================================
RCS file: /cvsroot/src/sys/fs/ntfs/ntfs_ihash.c,v
retrieving revision 1.2
diff -u -u -p -r1.2 ntfs_ihash.c
--- src/sys/fs/ntfs/ntfs_ihash.c	7 Aug 2003 16:31:39 -0000	1.2
+++ src/sys/fs/ntfs/ntfs_ihash.c	9 Mar 2004 18:59:35 -0000
@@ -70,7 +70,7 @@ ntfs_nthashinit()
 	lockinit(&ntfs_hashlock, PINOD, "ntfs_nthashlock", 0, 0);
 	ntfs_nthashtbl = HASHINIT(desiredvnodes, M_NTFSNTHASH, M_WAITOK,
 	    &ntfs_nthash);
-	simple_lock_init(&ntfs_nthash_slock);
+	simple_lock_init(&ntfs_nthash_slock, IPL_NONE/*XXXUNVERIFIED*/);
 }
 
 #ifdef __NetBSD__
Index: src/sys/fs/ntfs/ntfs_subr.c
===================================================================
RCS file: /cvsroot/src/sys/fs/ntfs/ntfs_subr.c,v
retrieving revision 1.7
diff -u -u -p -r1.7 ntfs_subr.c
--- src/sys/fs/ntfs/ntfs_subr.c	29 Jun 2003 22:31:10 -0000	1.7
+++ src/sys/fs/ntfs/ntfs_subr.c	9 Mar 2004 18:59:36 -0000
@@ -422,7 +422,7 @@ ntfs_ntlookup(
 
 	/* init lock and lock the newborn ntnode */
 	lockinit(&ip->i_lock, PINOD, "ntnode", 0, LK_EXCLUSIVE);
-	simple_lock_init(&ip->i_interlock);
+	simple_lock_init(&ip->i_interlock, IPL_NONE/*XXXUNVERIFIED*/);
 	ntfs_ntget(ip);
 
 	ntfs_nthashins(ip);
Index: src/sys/fs/smbfs/smbfs_kq.c
===================================================================
RCS file: /cvsroot/src/sys/fs/smbfs/smbfs_kq.c,v
retrieving revision 1.7
diff -u -u -p -r1.7 smbfs_kq.c
--- src/sys/fs/smbfs/smbfs_kq.c	29 Jun 2003 22:31:12 -0000	1.7
+++ src/sys/fs/smbfs/smbfs_kq.c	9 Mar 2004 18:59:37 -0000
@@ -97,7 +97,7 @@ struct kevq {
 static struct proc *smbkqp;		/* the kevent handler */
 static struct smb_cred smbkq_scred;
 
-static struct simplelock smbkq_lock = SIMPLELOCK_INITIALIZER;
+static struct simplelock smbkq_lock = SIMPLELOCK_INITIALIZER(IPL_NONE/*XXXUNVERIFIED*/);
 					/* guard access to k*evlist */
 static SLIST_HEAD(, kevq) kevlist = SLIST_HEAD_INITIALIZER(kevlist);
 static SLIST_HEAD(, kevq) kplist = SLIST_HEAD_INITIALIZER(kplist);
Index: src/sys/fs/smbfs/smbfs_vfsops.c
===================================================================
RCS file: /cvsroot/src/sys/fs/smbfs/smbfs_vfsops.c,v
retrieving revision 1.32
diff -u -u -p -r1.32 smbfs_vfsops.c
--- src/sys/fs/smbfs/smbfs_vfsops.c	4 Dec 2003 19:38:23 -0000	1.32
+++ src/sys/fs/smbfs/smbfs_vfsops.c	9 Mar 2004 18:59:37 -0000
@@ -356,7 +356,7 @@ void
 smbfs_init(void)
 {
 	pool_init(&smbfs_node_pool, sizeof(struct smbnode), 0, 0, 0,
-		"smbfsnopl", &pool_allocator_nointr);
+		"smbfsnopl", &pool_allocator_nointr, IPL_NONE);
 
 #ifdef _LKM
 	/* Need explicit attach if LKM */
Index: src/sys/kern/kern_descrip.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_descrip.c,v
retrieving revision 1.123
diff -u -u -p -r1.123 kern_descrip.c
--- src/sys/kern/kern_descrip.c	7 Jan 2004 09:26:29 -0000	1.123
+++ src/sys/kern/kern_descrip.c	9 Mar 2004 18:59:39 -0000
@@ -74,7 +74,7 @@ struct pool	cwdi_pool;	/* memory pool fo
 struct pool	filedesc0_pool;	/* memory pool for filedesc0 structures */
 
 /* Global file list lock */
-static struct simplelock filelist_slock = SIMPLELOCK_INITIALIZER;
+static struct simplelock filelist_slock = SIMPLELOCK_INITIALIZER(IPL_NONE);
 
 MALLOC_DEFINE(M_FILE, "file", "Open file structure");
 MALLOC_DEFINE(M_FILEDESC, "file desc", "Open file descriptor table");
@@ -867,11 +867,11 @@ finit(void)
 {
 
 	pool_init(&file_pool, sizeof(struct file), 0, 0, 0, "filepl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 	pool_init(&cwdi_pool, sizeof(struct cwdinfo), 0, 0, 0, "cwdipl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 	pool_init(&filedesc0_pool, sizeof(struct filedesc0), 0, 0, 0, "fdescpl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 }
 
 /*
@@ -918,7 +918,7 @@ falloc(struct proc *p, struct file **res
 	}
 	simple_unlock(&filelist_slock);
 	p->p_fd->fd_ofiles[i] = fp;
-	simple_lock_init(&fp->f_slock);
+	simple_lock_init(&fp->f_slock, IPL_NONE);
 	fp->f_count = 1;
 	fp->f_cred = p->p_ucred;
 	crhold(fp->f_cred);
Index: src/sys/kern/kern_event.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_event.c,v
retrieving revision 1.19
diff -u -u -p -r1.19 kern_event.c
--- src/sys/kern/kern_event.c	14 Feb 2004 11:56:28 -0000	1.19
+++ src/sys/kern/kern_event.c	9 Mar 2004 18:59:40 -0000
@@ -161,9 +161,9 @@ kqueue_init(void)
 {
 
 	pool_init(&kqueue_pool, sizeof(struct kqueue), 0, 0, 0, "kqueuepl",
-	    NULL);
+	    NULL, IPL_NONE);
 	pool_init(&knote_pool, sizeof(struct knote), 0, 0, 0, "knotepl",
-	    NULL);
+	    NULL, IPL_NONE);
 }
 
 /*
@@ -629,7 +629,7 @@ sys_kqueue(struct lwp *l, void *v, regis
 	fp->f_ops = &kqueueops;
 	kq = pool_get(&kqueue_pool, PR_WAITOK);
 	memset((char *)kq, 0, sizeof(struct kqueue));
-	simple_lock_init(&kq->kq_lock);
+	simple_lock_init(&kq->kq_lock, IPL_SCHED);
 	TAILQ_INIT(&kq->kq_head);
 	fp->f_data = (caddr_t)kq;	/* store the kqueue with the fp */
 	*retval = fd;
Index: src/sys/kern/kern_fork.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_fork.c,v
retrieving revision 1.114
diff -u -u -p -r1.114 kern_fork.c
--- src/sys/kern/kern_fork.c	12 Feb 2004 23:47:21 -0000	1.114
+++ src/sys/kern/kern_fork.c	9 Mar 2004 18:59:40 -0000
@@ -274,9 +274,9 @@ fork1(struct lwp *l1, int flags, int exi
 	memcpy(&p2->p_startcopy, &p1->p_startcopy,
 	    (unsigned) ((caddr_t)&p2->p_endcopy - (caddr_t)&p2->p_startcopy));
 
-	simple_lock_init(&p2->p_sigctx.ps_silock);
+	simple_lock_init(&p2->p_sigctx.ps_silock, IPL_NONE/*XXXUNVERIFIED*/);
 	CIRCLEQ_INIT(&p2->p_sigctx.ps_siginfo);
-	simple_lock_init(&p2->p_lock);
+	simple_lock_init(&p2->p_lock, IPL_NONE/*XXXUNVERIFIED*/);
 	LIST_INIT(&p2->p_lwps);
 
 	/*
Index: src/sys/kern/kern_lock.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_lock.c,v
retrieving revision 1.75
diff -u -u -p -r1.75 kern_lock.c
--- src/sys/kern/kern_lock.c	13 Feb 2004 11:36:22 -0000	1.75
+++ src/sys/kern/kern_lock.c	9 Mar 2004 18:59:41 -0000
@@ -303,7 +303,7 @@ do {									\
 
 #if defined(LOCKDEBUG) /* { */
 #if defined(MULTIPROCESSOR) /* { */
-struct simplelock spinlock_list_slock = SIMPLELOCK_INITIALIZER;
+struct simplelock spinlock_list_slock = SIMPLELOCK_INITIALIZER(IPL_NONE);
 
 #define	SPINLOCK_LIST_LOCK()						\
 	__cpu_simple_lock(&spinlock_list_slock.lock_data)
@@ -380,7 +380,11 @@ lockinit(struct lock *lkp, int prio, con
 {
 
 	memset(lkp, 0, sizeof(struct lock));
-	simple_lock_init(&lkp->lk_interlock);
+	/* XXX lock(9) says simplelocks are only interrupts that can be used
+	 * in an interrupt handler.  However, the kern_lock is a spinlock,
+	 * so we allow spin locks from interrupts as well, at least for now. */
+	simple_lock_init(&lkp->lk_interlock,
+	    ((flags & LK_SPIN) ? IPL_LOCK : IPL_NONE));
 	lkp->lk_flags = flags & LK_EXTFLG_MASK;
 	if (flags & LK_SPIN)
 		lkp->lk_cpu = LK_NOCPU;
@@ -994,7 +998,7 @@ TAILQ_HEAD(, simplelock) simplelock_list
     TAILQ_HEAD_INITIALIZER(simplelock_list);
 
 #if defined(MULTIPROCESSOR) /* { */
-struct simplelock simplelock_list_slock = SIMPLELOCK_INITIALIZER;
+struct simplelock simplelock_list_slock = SIMPLELOCK_INITIALIZER(IPL_LOCK);
 
 #define	SLOCK_LIST_LOCK()						\
 	__cpu_simple_lock(&simplelock_list_slock.lock_data)
@@ -1027,6 +1031,8 @@ do {									\
 	lock_printf(str);						\
 	lock_printf("lock: %p, currently at: %s:%d\n", (alp), (id), (l)); \
 	SLOCK_MP();							\
+	if ((alp)->lock_spl != IPL_NONE) \
+		lock_printf("requiring spl 0x%x\n", (alp)->lock_spl); \
 	if ((alp)->lock_file != NULL)					\
 		lock_printf("last locked: %s:%d\n", (alp)->lock_file,	\
 		    (alp)->lock_line);					\
@@ -1042,7 +1048,7 @@ do {									\
  * they are being called.
  */
 void
-simple_lock_init(struct simplelock *alp)
+simple_lock_init(struct simplelock *alp, int spl)
 {
 
 #if defined(MULTIPROCESSOR) /* { */
@@ -1055,6 +1061,7 @@ simple_lock_init(struct simplelock *alp)
 	alp->unlock_file = NULL;
 	alp->unlock_line = 0;
 	alp->lock_holder = LK_NOCPU;
+	alp->lock_spl = spl;
 }
 
 void
@@ -1063,6 +1070,15 @@ _simple_lock(__volatile struct simpleloc
 	cpuid_t cpu_id = cpu_number();
 	int s;
 
+#ifdef SPL_ASSERT /* XXX Not all arch'es implement spl assert functions yet */
+	if ((alp->lock_spl == IPL_NONE) && spl_in_context()) {
+		SLOCK_WHERE("simple_lock: invoked in interrupt context\n", alp, id, l);
+	}
+	if (!spl_is_blocked(alp->lock_spl)) {
+		SLOCK_WHERE("simple_lock: invoked without required spl\n", alp, id, l);
+	}
+#endif
+
 	s = spllock();
 
 	/*
@@ -1191,6 +1207,15 @@ _simple_unlock(__volatile struct simplel
 {
 	int s;
 
+#ifdef SPL_ASSERT /* XXX Not all arch'es implement spl assert functions yet */
+	if ((alp->lock_spl == IPL_NONE) && spl_in_context()) {
+		SLOCK_WHERE("simple_unlock: invoked in interrupt context\n", alp, id, l);
+	}
+	if (!spl_is_blocked(alp->lock_spl)) {
+		SLOCK_WHERE("simple_unlock: invoked without required spl\n", alp, id, l);
+	}
+#endif
+
 	s = spllock();
 
 	/*
Index: src/sys/kern/kern_malloc.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_malloc.c,v
retrieving revision 1.89
diff -u -u -p -r1.89 kern_malloc.c
--- src/sys/kern/kern_malloc.c	30 Oct 2003 01:58:18 -0000	1.89
+++ src/sys/kern/kern_malloc.c	9 Mar 2004 18:59:43 -0000
@@ -244,7 +244,7 @@ MALLOC_DEFINE(M_IPMADDR, "in_multi", "in
 MALLOC_DEFINE(M_MRTABLE, "mrt", "multicast routing tables");
 MALLOC_DEFINE(M_1394DATA, "1394data", "IEEE 1394 data buffers");
 
-struct simplelock malloc_slock = SIMPLELOCK_INITIALIZER;
+struct simplelock malloc_slock = SIMPLELOCK_INITIALIZER(IPL_VM);
 
 /*
  * Allocate a block of memory
Index: src/sys/kern/kern_malloc_debug.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_malloc_debug.c,v
retrieving revision 1.11
diff -u -u -p -r1.11 kern_malloc_debug.c
--- src/sys/kern/kern_malloc_debug.c	24 Oct 2003 00:53:43 -0000	1.11
+++ src/sys/kern/kern_malloc_debug.c	9 Mar 2004 18:59:43 -0000
@@ -222,7 +222,7 @@ debug_malloc_init(void)
 	debug_malloc_chunks_on_freelist = 0;
 
 	pool_init(&debug_malloc_pool, sizeof(struct debug_malloc_entry),
-	    0, 0, 0, "mdbepl", NULL);
+	    0, 0, 0, "mdbepl", NULL, IPL_VM);
 }
 
 /*
Index: src/sys/kern/kern_microtime.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_microtime.c,v
retrieving revision 1.4
diff -u -u -p -r1.4 kern_microtime.c
--- src/sys/kern/kern_microtime.c	28 Jun 2003 15:02:24 -0000	1.4
+++ src/sys/kern/kern_microtime.c	9 Mar 2004 18:59:43 -0000
@@ -80,7 +80,7 @@ void
 cc_microtime(struct timeval *tvp)
 {
 	static struct timeval lasttime;
-	static struct simplelock microtime_slock = SIMPLELOCK_INITIALIZER;
+	static struct simplelock microtime_slock = SIMPLELOCK_INITIALIZER(IPL_CLOCK);
 	struct timeval t;
 	struct cpu_info *ci = curcpu();
 	int64_t sec, usec;
Index: src/sys/kern/kern_proc.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_proc.c,v
retrieving revision 1.74
diff -u -u -p -r1.74 kern_proc.c
--- src/sys/kern/kern_proc.c	27 Feb 2004 02:43:25 -0000	1.74
+++ src/sys/kern/kern_proc.c	9 Mar 2004 18:59:44 -0000
@@ -237,31 +237,31 @@ procinit(void)
 	    hashinit(maxproc / 16, HASH_LIST, M_PROC, M_WAITOK, &uihash);
 
 	pool_init(&proc_pool, sizeof(struct proc), 0, 0, 0, "procpl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 	pool_init(&lwp_pool, sizeof(struct lwp), 0, 0, 0, "lwppl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 	pool_init(&lwp_uc_pool, sizeof(ucontext_t), 0, 0, 0, "lwpucpl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 	pool_init(&pgrp_pool, sizeof(struct pgrp), 0, 0, 0, "pgrppl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 	pool_init(&pcred_pool, sizeof(struct pcred), 0, 0, 0, "pcredpl",
-	    &pool_allocator_nointr);
+	    &pool_allocator_nointr, IPL_NONE);
 	pool_init(&p