remove splimp.

ok miod@

6 files changed, 31 insertions, 34 deletions

diff --git a/sys/arch/hp300/hp300/intr.c b/sys/arch/hp300/hp300/intr.c
index 41cc5a693e7..a578ee37451 100644
--- a/sys/arch/hp300/hp300/intr.c
+++ b/sys/arch/hp300/hp300/intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.c,v 1.15 2004/12/25 23:02:24 miod Exp $	*/
+/*	$OpenBSD: intr.c,v 1.16 2006/03/13 19:39:52 brad Exp $	*/
 /*	$NetBSD: intr.c,v 1.5 1998/02/16 20:58:30 thorpej Exp $	*/
 
 /*-
@@ -67,7 +67,7 @@ void	netintr(void);
 typedef LIST_HEAD(, isr) isr_list_t;
 isr_list_t isr_list[NISR];
 
-u_short	hp300_bioipl, hp300_netipl, hp300_ttyipl, hp300_impipl;
+u_short	hp300_bioipl, hp300_netipl, hp300_ttyipl, hp300_vmipl;
 
 void	intr_computeipl(void);
 
@@ -81,7 +81,7 @@ intr_init()
 		LIST_INIT(&isr_list[i]);
 
 	/* Default interrupt priorities. */
-	hp300_bioipl = hp300_netipl = hp300_ttyipl = hp300_impipl =
+	hp300_bioipl = hp300_netipl = hp300_ttyipl = hp300_vmipl =
 	    (PSL_S|PSL_IPL3);
 }
 
@@ -96,7 +96,7 @@ intr_computeipl()
 	int ipl;
 
 	/* Start with low values. */
-	hp300_bioipl = hp300_netipl = hp300_ttyipl = hp300_impipl =
+	hp300_bioipl = hp300_netipl = hp300_ttyipl = hp300_vmipl =
 	    (PSL_S|PSL_IPL3);
 
 	for (ipl = 0; ipl < NISR; ipl++) {
@@ -130,7 +130,7 @@ intr_computeipl()
 	}
 
 	/*
-	 * Enforce `bio <= net <= tty <= imp'
+	 * Enforce `bio <= net <= tty <= vm'
 	 */
 
 	if (hp300_netipl < hp300_bioipl)
@@ -139,8 +139,8 @@ intr_computeipl()
 	if (hp300_ttyipl < hp300_netipl)
 		hp300_ttyipl = hp300_netipl;
 
-	if (hp300_impipl < hp300_ttyipl)
-		hp300_impipl = hp300_ttyipl;
+	if (hp300_vmipl < hp300_ttyipl)
+		hp300_vmipl = hp300_ttyipl;
 }
 
 void
@@ -148,8 +148,8 @@ intr_printlevels()
 {
 
 #ifdef DEBUG
-	printf("psl: bio = 0x%x, net = 0x%x, tty = 0x%x, imp = 0x%x\n",
-	    hp300_bioipl, hp300_netipl, hp300_ttyipl, hp300_impipl);
+	printf("psl: bio = 0x%x, net = 0x%x, tty = 0x%x, vm = 0x%x\n",
+	    hp300_bioipl, hp300_netipl, hp300_ttyipl, hp300_vmipl);
 #endif
 
 	printf("interrupt levels: bio = %d, net = %d, tty = %d\n",
diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h
index 5fa0590580e..f64d4a4b1a6 100644
--- a/sys/arch/hp300/include/intr.h
+++ b/sys/arch/hp300/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.16 2005/05/01 09:55:49 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.17 2006/03/13 19:39:52 brad Exp $	*/
 /*	$NetBSD: intr.h,v 1.2 1997/07/24 05:43:08 scottr Exp $	*/
 
 /*-
@@ -95,7 +95,7 @@ struct isr {
 extern	unsigned short hp300_bioipl;
 extern	unsigned short hp300_netipl;
 extern	unsigned short hp300_ttyipl;
-extern	unsigned short hp300_impipl;
+extern	unsigned short hp300_vmipl;
 
 /*
  * Interrupt "levels".  These are a more abstract representation
@@ -123,10 +123,9 @@ extern	unsigned short hp300_impipl;
 #define	splbio()		_splraise(hp300_bioipl)
 #define	splnet()		_splraise(hp300_netipl)
 #define	spltty()		_splraise(hp300_ttyipl)
-#define	splimp()		_splraise(hp300_impipl)
 #define	splclock()		_splraise(PSL_S | PSL_IPL6)
 #define	splstatclock()		_splraise(PSL_S | PSL_IPL6)
-#define	splvm()			_splraise(hp300_impipl)
+#define	splvm()			_splraise(hp300_vmipl)
 #define	splhigh()		_spl(PSL_S | PSL_IPL7)
 
 /* watch out for side effects */
diff --git a/sys/arch/m88k/include/intr.h b/sys/arch/m88k/include/intr.h
index 22684ced751..2aaef73783e 100644
--- a/sys/arch/m88k/include/intr.h
+++ b/sys/arch/m88k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.6 2005/12/03 19:04:06 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.7 2006/03/13 19:39:52 brad Exp $	*/
 /*
  * Copyright (C) 2000 Steve Murphree, Jr.
  * All rights reserved.
@@ -63,7 +63,6 @@ void splassert_check(int, const char *);
 #define splclock()		raiseipl(IPL_CLOCK)
 #define splstatclock()		raiseipl(IPL_STATCLOCK)
 #define	splsched()		raiseipl(IPL_SCHED)
-#define splimp()		raiseipl(IPL_IMP)
 #define splvm()			raiseipl(IPL_VM)
 #define splhigh()		setipl(IPL_HIGH)
 
diff --git a/sys/arch/mac68k/dev/esp.c b/sys/arch/mac68k/dev/esp.c
index 624fa3eb0ab..77819d5c999 100644
--- a/sys/arch/mac68k/dev/esp.c
+++ b/sys/arch/mac68k/dev/esp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esp.c,v 1.25 2006/01/22 18:37:56 miod Exp $	*/
+/*	$OpenBSD: esp.c,v 1.26 2006/03/13 19:39:52 brad Exp $	*/
 /*	$NetBSD: esp.c,v 1.17 1998/09/05 15:15:35 pk Exp $	*/
 
 /*
@@ -602,7 +602,7 @@ esp_iosb_have_dreq(esc)
 
 /* Faster spl constructs, without saving old values */
 #define	__splx(s)	__asm __volatile ("movew %0,sr" : : "di" (s));
-#define	__splimp()	__splx(mac68k_impipl)
+#define	__splvm()	__splx(mac68k_vmipl)
 #define	__splbio()	__splx(mac68k_bioipl)
 
 void
@@ -651,7 +651,7 @@ restart_dmago:
 	if (esc->sc_datain == 0) {
 		while (esc->sc_pdmalen) {
 			WAIT;
-			__splimp(); *pdma = *(esc->sc_pdmaddr)++; __splbio();
+			__splvm(); *pdma = *(esc->sc_pdmaddr)++; __splbio();
 			esc->sc_pdmalen -= 2;
 		}
 		if (esc->sc_pad) {
@@ -660,19 +660,19 @@ restart_dmago:
 			c = (unsigned char *) esc->sc_pdmaddr;
 			us = *c;
 			WAIT;
-			__splimp(); *pdma = us; __splbio();
+			__splvm(); *pdma = us; __splbio();
 		}
 	} else {
 		while (esc->sc_pdmalen) {
 			WAIT;
-			__splimp(); *(esc->sc_pdmaddr)++ = *pdma; __splbio();
+			__splvm(); *(esc->sc_pdmaddr)++ = *pdma; __splbio();
 			esc->sc_pdmalen -= 2;
 		}
 		if (esc->sc_pad) {
 			unsigned short  us;
 			unsigned char   *c;
 			WAIT;
-			__splimp(); us = *pdma; __splbio();
+			__splvm(); us = *pdma; __splbio();
 			c = (unsigned char *) esc->sc_pdmaddr;
 			*c = us & 0xff;
 		}
diff --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h
index 2f5b821acfe..2e0cda8d139 100644
--- a/sys/arch/mac68k/include/intr.h
+++ b/sys/arch/mac68k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.13 2006/01/13 19:36:44 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.14 2006/03/13 19:39:52 brad Exp $	*/
 /*	$NetBSD: intr.h,v 1.9 1998/08/12 06:58:42 scottr Exp $	*/
 
 /*
@@ -68,12 +68,12 @@
 
 /*
  * splnet must block hardware network interrupts
- * splimp must be > spltty
+ * splvm must be > spltty
  */
 extern u_short	mac68k_ttyipl;
 extern u_short	mac68k_bioipl;
 extern u_short	mac68k_netipl;
-extern u_short	mac68k_impipl;
+extern u_short	mac68k_vmipl;
 extern u_short	mac68k_audioipl;
 extern u_short	mac68k_clockipl;
 extern u_short	mac68k_statclockipl;
@@ -111,8 +111,7 @@ extern u_short	mac68k_statclockipl;
 #define	spltty()		_splraise(mac68k_ttyipl)
 #define	splbio()		_splraise(mac68k_bioipl)
 #define	splnet()		_splraise(mac68k_netipl)
-#define	splimp()		_splraise(mac68k_impipl)
-#define	splvm()			_splraise(mac68k_impipl)
+#define	splvm()			_splraise(mac68k_vmipl)
 #define	splaudio()		_splraise(mac68k_audioipl)
 #define	splclock()		_splraise(mac68k_clockipl)
 #define	splstatclock()		_splraise(mac68k_statclockipl)
diff --git a/sys/arch/mac68k/mac68k/intr.c b/sys/arch/mac68k/mac68k/intr.c
index b779cf7bf8f..77367fb1dc1 100644
--- a/sys/arch/mac68k/mac68k/intr.c
+++ b/sys/arch/mac68k/mac68k/intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.c,v 1.6 2006/01/01 13:16:01 miod Exp $	*/
+/*	$OpenBSD: intr.c,v 1.7 2006/03/13 19:39:52 brad Exp $	*/
 /*	$NetBSD: intr.c,v 1.2 1998/08/25 04:03:56 scottr Exp $	*/
 
 /*-
@@ -72,7 +72,7 @@ int	intr_debug = 0;
 u_short	mac68k_ttyipl;
 u_short	mac68k_bioipl;
 u_short	mac68k_netipl;
-u_short	mac68k_impipl;
+u_short	mac68k_vmipl;
 u_short	mac68k_clockipl;
 u_short	mac68k_statclockipl;
 
@@ -89,12 +89,12 @@ intr_init()
 
 	if (mac68k_machine.aux_interrupts) {
 		mac68k_netipl = (PSL_S | PSL_IPL3);
-		mac68k_impipl = (PSL_S | PSL_IPL6);
+		mac68k_vmipl = (PSL_S | PSL_IPL6);
 		mac68k_clockipl = (PSL_S | PSL_IPL6);
 		mac68k_statclockipl = (PSL_S | PSL_IPL6);
 	} else {
 		mac68k_netipl = (PSL_S | PSL_IPL2);
-		mac68k_impipl = (PSL_S | PSL_IPL2);
+		mac68k_vmipl = (PSL_S | PSL_IPL2);
 		mac68k_clockipl = (PSL_S | PSL_IPL2);
 		mac68k_statclockipl = (PSL_S | PSL_IPL2);
 
@@ -122,11 +122,11 @@ intr_computeipl()
 	if (mac68k_netipl > mac68k_ttyipl)
 		mac68k_ttyipl = mac68k_netipl;
 
-	if (mac68k_ttyipl > mac68k_impipl)
-		mac68k_impipl = mac68k_ttyipl;
+	if (mac68k_ttyipl > mac68k_vmipl)
+		mac68k_vmipl = mac68k_ttyipl;
 
-	if (mac68k_impipl > mac68k_statclockipl)
-		mac68k_statclockipl = mac68k_impipl;
+	if (mac68k_vmipl > mac68k_statclockipl)
+		mac68k_statclockipl = mac68k_vmipl;
 
 	if (mac68k_statclockipl > mac68k_clockipl)
 		mac68k_clockipl = mac68k_statclockipl;