remove splimp.

8 files changed, 8 insertions, 18 deletions

diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h
index ea5b7d5c697..5576f4bcc6e 100644
--- a/sys/arch/alpha/include/intr.h
+++ b/sys/arch/alpha/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.21 2006/01/29 10:47:35 martin Exp $ */
+/* $OpenBSD: intr.h,v 1.22 2006/03/12 03:14:36 brad Exp $ */
 /* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */
 
 /*-
@@ -125,7 +125,6 @@ int _splraise(int);
 #define splsoftnet()		splsoft()
 #define splnet()                _splraise(ALPHA_PSL_IPL_IO)
 #define splbio()                _splraise(ALPHA_PSL_IPL_IO)
-#define splimp()                _splraise(ALPHA_PSL_IPL_IO)
 #define spltty()                _splraise(ALPHA_PSL_IPL_IO)
 #define splserial()             _splraise(ALPHA_PSL_IPL_IO)
 #define splaudio()		_splraise(ALPHA_PSL_IPL_IO)
diff --git a/sys/arch/arm/footbridge/footbridge_intr.h b/sys/arch/arm/footbridge/footbridge_intr.h
index 4f860821b76..b2121dc0d71 100644
--- a/sys/arch/arm/footbridge/footbridge_intr.h
+++ b/sys/arch/arm/footbridge/footbridge_intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: footbridge_intr.h,v 1.5 2005/09/22 04:14:44 drahn Exp $	*/
+/*	$OpenBSD: footbridge_intr.h,v 1.6 2006/03/12 03:14:36 brad Exp $	*/
 /* 	$NetBSD: footbridge_intr.h,v 1.4 2003/01/03 00:56:00 thorpej Exp $	*/
 
 /*
@@ -171,7 +171,6 @@ void	_setsoftintr(int);
 #define	spltty()	_splraise(IPL_TTY)
 #define spllpt()        spltty()
 #define	splvm()		_splraise(IPL_VM)
-#define	splimp()	_splraise(IPL_VM)
 #define	splaudio()	_splraise(IPL_AUDIO)
 #define	splclock()	_splraise(IPL_CLOCK)
 #define	splstatclock()	_splraise(IPL_STATCLOCK)
diff --git a/sys/arch/hppa/include/intr.h b/sys/arch/hppa/include/intr.h
index 84aca5a71dc..fd40afee537 100644
--- a/sys/arch/hppa/include/intr.h
+++ b/sys/arch/hppa/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.19 2005/04/19 15:29:47 mickey Exp $	*/
+/*	$OpenBSD: intr.h,v 1.20 2006/03/12 03:14:36 brad Exp $	*/
 
 /*
  * Copyright (c) 2002-2004 Michael Shalayeff
@@ -110,7 +110,6 @@ splx(int ncpl)
 #define	splsofttty()	splraise(IPL_SOFTTTY)
 #define	spltty()	splraise(IPL_TTY)
 #define	splvm()		splraise(IPL_VM)
-#define	splimp()	splvm()
 #define	splaudio()	splraise(IPL_AUDIO)
 #define	splclock()	splraise(IPL_CLOCK)
 #define	splstatclock()	splraise(IPL_STATCLOCK)
diff --git a/sys/arch/hppa64/include/cpu.h b/sys/arch/hppa64/include/cpu.h
index f8b6770b7cd..43cc46203aa 100644
--- a/sys/arch/hppa64/include/cpu.h
+++ b/sys/arch/hppa64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.8 2005/09/25 20:48:21 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.9 2006/03/12 03:14:37 brad Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -101,7 +101,6 @@
 #define	splsofttty()	splraise(IPL_SOFTTTY)
 #define	spltty()	splraise(IPL_TTY)
 #define	splvm()		splraise(IPL_VM)
-#define	splimp()	splvm()
 #define	splaudio()	splraise(IPL_AUDIO)
 #define	splclock()	splraise(IPL_CLOCK)
 #define	splsched()	splraise(IPL_SCHED)
diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h
index aadd18b1fed..5a2adc8fc38 100644
--- a/sys/arch/sgi/include/intr.h
+++ b/sys/arch/sgi/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.13 2005/04/19 15:29:48 mickey Exp $ */
+/*	$OpenBSD: intr.h,v 1.14 2006/03/12 03:14:37 brad Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -87,7 +87,6 @@
 #define spltty()		splraise(imask[IPL_TTY])
 #define splaudio()		splraise(imask[IPL_AUDIO])
 #define splclock()		splraise(SPL_CLOCKMASK|SINT_ALLMASK)
-#define splimp()		splraise(imask[IPL_VM])
 #define splvm()			splraise(imask[IPL_VM])
 #define splsoftclock()		splraise(SINT_CLOCKMASK)
 #define splsoftnet()		splraise(SINT_NETMASK|SINT_CLOCKMASK)
@@ -97,7 +96,6 @@
 #define splnet()		splhigh()
 #define spltty()		splhigh()
 #define splclock()		splhigh()
-#define splimp()		splhigh()
 #define splvm()			splhigh()
 #define splsoftclock()		splhigh()
 #define splsoftnet()		splhigh()
diff --git a/sys/arch/sparc/include/psl.h b/sys/arch/sparc/include/psl.h
index 356d2460355..8454ad65e57 100644
--- a/sys/arch/sparc/include/psl.h
+++ b/sys/arch/sparc/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.20 2005/04/19 15:29:48 mickey Exp $	*/
+/*	$OpenBSD: psl.h,v 1.21 2006/03/12 03:14:37 brad Exp $	*/
 /*	$NetBSD: psl.h,v 1.12 1997/03/10 21:49:11 pk Exp $ */
 
 /*
@@ -222,8 +222,6 @@ SPLHOLD(splbio, IPL_BIO)
 SPLHOLD(splnet, IPL_NET)
 SPLHOLD(spltty, IPL_TTY)
 SPLHOLD(splvm, IPL_VM)
-/* XXX - the following two should die. */
-#define splimp splvm
 SPLHOLD(splclock, IPL_CLOCK)
 SPLHOLD(splfd, IPL_FD)
 SPLHOLD(splzs, IPL_ZS)
diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h
index 3b0d43abdf7..42b0554deb0 100644
--- a/sys/arch/vax/include/param.h
+++ b/sys/arch/vax/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.29 2005/11/08 15:05:56 martin Exp $ */
+/*	$OpenBSD: param.h,v 1.30 2006/03/12 03:14:37 brad Exp $ */
 /*      $NetBSD: param.h,v 1.39 1999/10/22 21:14:34 ragge Exp $    */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -188,7 +188,6 @@
 #define splbio()	_splraise(0x15)	/* IPL15 */
 #define splnet()	_splraise(0x15)	/* IPL15 */
 #define spltty()	_splraise(0x15)	/* IPL15 */
-#define splimp()	_splraise(0x17)	/* IPL17 */
 #define splvm()		_splraise(0x17)	/* IPL17 */
 #define splclock()	_splraise(0x18)	/* IPL18 */
 #define splhigh()	_splraise(0x1f)	/* IPL1F */
diff --git a/sys/arch/zaurus/include/intr.h b/sys/arch/zaurus/include/intr.h
index 94a354132c5..4d46a576a14 100644
--- a/sys/arch/zaurus/include/intr.h
+++ b/sys/arch/zaurus/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.4 2005/12/27 20:05:34 drahn Exp $	*/
+/*	$OpenBSD: intr.h,v 1.5 2006/03/12 03:14:37 brad Exp $	*/
 /*	$NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $	*/
 
 /*
@@ -131,7 +131,6 @@ void	_setsoftintr(int);
 #define	splbio()	_splraise(IPL_BIO)
 #define	splnet()	_splraise(IPL_NET)
 #define	spltty()	_splraise(IPL_TTY)
-#define	splimp()	_splraise(IPL_VM)
 #define	splvm()		_splraise(IPL_VM)
 #define	splaudio()	_splraise(IPL_AUDIO)
 #define	splclock()	_splraise(IPL_CLOCK)