diff --git a/sys/arch/acorn26/include/intr.h b/sys/arch/acorn26/include/intr.h
index 8c11d795673c..7843a1799901 100644
--- a/sys/arch/acorn26/include/intr.h
+++ b/sys/arch/acorn26/include/intr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.5 2005/12/11 12:16:04 christos Exp $ */
+/* $NetBSD: intr.h,v 1.6 2006/01/01 14:24:33 yamt Exp $ */
 /*-
  * Copyright (c) 1998, 2000 Ben Harris
  * All rights reserved.
@@ -56,6 +56,7 @@
 #define IPL_STATCLOCK	10
 #define IPL_SCHED	11
 #define IPL_HIGH	12
+#define	IPL_LOCK	IPL_HIGH
 #define NIPL		IPL_HIGH + 1
 
 #if defined(_KERNEL) && !defined(_LOCORE)
@@ -78,6 +79,8 @@
 /* #define	splsched()	splhigh() */
 #define spllock()	splhigh()
 
+#define	splraiseipl(x)	(((x) == IPL_HIGH) ? splhigh() : raisespl(x))
+
 #define spl0()			lowerspl(IPL_NONE)
 #define spllowersoftclock()	lowerspl(IPL_SOFTCLOCK)
 #define splx(s)			lowerspl(s)
diff --git a/sys/arch/arm/footbridge/footbridge_intr.h b/sys/arch/arm/footbridge/footbridge_intr.h
index d72062403559..a283d74a9de5 100644
--- a/sys/arch/arm/footbridge/footbridge_intr.h
+++ b/sys/arch/arm/footbridge/footbridge_intr.h
@@ -1,4 +1,4 @@
-/* 	$NetBSD: footbridge_intr.h,v 1.6 2005/12/24 20:06:52 perry Exp $	*/
+/* 	$NetBSD: footbridge_intr.h,v 1.7 2006/01/01 14:24:33 yamt Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -52,11 +52,14 @@
 #define IPL_NET		5	/* network */
 #define IPL_SOFTSERIAL	6	/* serial software interrupts */
 #define IPL_TTY		7	/* terminal */
+#define	IPL_LPT		IPL_TTY
 #define IPL_VM		8	/* memory allocation */
 #define IPL_AUDIO	9	/* audio */
 #define IPL_CLOCK	10	/* clock */
 #define IPL_STATCLOCK	11	/* statclock */
 #define IPL_HIGH	12	/* everything */
+#define	IPL_SCHED	IPL_HIGH
+#define	IPL_LOCK	IPL_HIGH
 #define IPL_SERIAL	13	/* serial */
 
 #define NIPL		14
@@ -163,25 +166,12 @@ void	_setsoftintr(int);
 #include <machine/irqhandler.h>
 
 #define	splsoft()	_splraise(IPL_SOFT)
-#define	splsoftclock()	_splraise(IPL_SOFTCLOCK)
-#define	splsoftnet()	_splraise(IPL_SOFTNET)
-#define	splbio()	_splraise(IPL_BIO)
-#define	splnet()	_splraise(IPL_NET)
-#define splsoftserial()	_splraise(IPL_SOFTSERIAL)
-#define	spltty()	_splraise(IPL_TTY)
-#define spllpt()        spltty()
-#define	splvm()		_splraise(IPL_VM)
-#define	splaudio()	_splraise(IPL_AUDIO)
-#define	splclock()	_splraise(IPL_CLOCK)
-#define	splstatclock()	_splraise(IPL_STATCLOCK)
-#define	splhigh()	_splraise(IPL_HIGH)
-#define	splserial()	_splraise(IPL_SERIAL)
+#define	splraiseipl(x)	_splraise(x)
 
 #define	spl0()		(void)_spllower(IPL_NONE)
 #define	spllowersoftclock() (void)_spllower(IPL_SOFTCLOCK)
 
-#define	splsched()	splhigh()
-#define	spllock()	splhigh()
+#include <sys/spl.h>
 
 /* Use generic software interrupt support. */
 #include <arm/softintr.h>
diff --git a/sys/arch/evbarm/include/intr.h b/sys/arch/evbarm/include/intr.h
index fabe836e0b32..344d251d372a 100644
--- a/sys/arch/evbarm/include/intr.h
+++ b/sys/arch/evbarm/include/intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.13 2005/12/24 20:06:59 perry Exp $	*/
+/*	$NetBSD: intr.h,v 1.14 2006/01/01 14:24:33 yamt Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -54,6 +54,8 @@
 #define	IPL_CLOCK	10	/* clock interrupt */
 #define	IPL_STATCLOCK	11	/* statistics clock interrupt */
 #define	IPL_HIGH	12	/* everything */
+#define	IPL_SCHED	IPL_HIGH
+#define	IPL_LOCK	IPL_HIGH
 #define	IPL_SERIAL	13	/* serial device */
 
 #define	NIPL		14
@@ -146,24 +148,13 @@ void	_setsoftintr(int);
 
 #endif /* _LKM */
 
-#define	splhigh()	_splraise(IPL_HIGH)
 #define	splsoft()	_splraise(IPL_SOFT)
-#define	splsoftclock()	_splraise(IPL_SOFTCLOCK)
-#define	splsoftnet()	_splraise(IPL_SOFTNET)
-#define	splbio()	_splraise(IPL_BIO)
-#define	splnet()	_splraise(IPL_NET)
-#define	spltty()	_splraise(IPL_TTY)
-#define	splvm()		_splraise(IPL_VM)
-#define	splaudio()	_splraise(IPL_AUDIO)
-#define	splclock()	_splraise(IPL_CLOCK)
-#define	splstatclock()	_splraise(IPL_STATCLOCK)
-#define	splserial()	_splraise(IPL_SERIAL)
+#define	splraiseipl(x)	_splraise(x)
 
 #define	spl0()		_spllower(IPL_NONE)
 #define	spllowersoftclock() _spllower(IPL_SOFTCLOCK)
 
-#define	splsched()	splhigh()
-#define	spllock()	splhigh()
+#include <sys/spl.h>
 
 /* Use generic software interrupt support. */
 #include <arm/softintr.h>
diff --git a/sys/arch/iyonix/include/intr.h b/sys/arch/iyonix/include/intr.h
index 1b144c7da1a8..8e1c93178e11 100644
--- a/sys/arch/iyonix/include/intr.h
+++ b/sys/arch/iyonix/include/intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.3 2005/12/24 20:07:14 perry Exp $	*/
+/*	$NetBSD: intr.h,v 1.4 2006/01/01 14:24:33 yamt Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -54,6 +54,8 @@
 #define	IPL_CLOCK	10	/* clock interrupt */
 #define	IPL_STATCLOCK	11	/* statistics clock interrupt */
 #define	IPL_HIGH	12	/* everything */
+#define	IPL_SCHED	IPL_HIGH
+#define	IPL_LOCK	IPL_HIGH
 #define	IPL_SERIAL	13	/* serial device */
 
 #define	NIPL		14
@@ -132,24 +134,13 @@ void	_setsoftintr(int);
 
 #endif /* _LKM */
 
-#define	splhigh()	_splraise(IPL_HIGH)
 #define	splsoft()	_splraise(IPL_SOFT)
-#define	splsoftclock()	_splraise(IPL_SOFTCLOCK)
-#define	splsoftnet()	_splraise(IPL_SOFTNET)
-#define	splbio()	_splraise(IPL_BIO)
-#define	splnet()	_splraise(IPL_NET)
-#define	spltty()	_splraise(IPL_TTY)
-#define	splvm()		_splraise(IPL_VM)
-#define	splaudio()	_splraise(IPL_AUDIO)
-#define	splclock()	_splraise(IPL_CLOCK)
-#define	splstatclock()	_splraise(IPL_STATCLOCK)
-#define	splserial()	_splraise(IPL_SERIAL)
+#define	splraiseipl(x)	_splraise(x)
 
 #define	spl0()		_spllower(IPL_NONE)
 #define	spllowersoftclock() _spllower(IPL_SOFTCLOCK)
 
-#define	splsched()	splhigh()
-#define	spllock()	splhigh()
+#include <sys/spl.h>
 
 /* Use generic software interrupt support. */
 #include <arm/softintr.h>