Add spllowersoftclock(), same as splsoftclock(). (art@ ok)

12 files changed, 88 insertions, 75 deletions

diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h
index 6f4b5c59974..6c30e75771a 100644
--- a/sys/arch/alpha/include/intr.h
+++ b/sys/arch/alpha/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.5 1998/06/29 05:32:51 downsj Exp $	*/
+/*	$OpenBSD: intr.h,v 1.6 2000/07/06 15:25:02 ho Exp $	*/
 /*	$NetBSD: intr.h,v 1.4 1996/12/03 17:34:47 cgd Exp $	*/
 
 /*
@@ -49,6 +49,7 @@
 #define splx(s)								\
 	    (s == ALPHA_PSL_IPL_0 ? spl0() : alpha_pal_swpipl(s))
 #define splsoft()               alpha_pal_swpipl(ALPHA_PSL_IPL_SOFT)
+#define spllowersoftclock()     splsoft()
 #define splsoftclock()          splsoft()
 #define splsoftnet()            splsoft()
 #define splnet()                alpha_pal_swpipl(ALPHA_PSL_IPL_IO)
diff --git a/sys/arch/arc/include/intr.h b/sys/arch/arc/include/intr.h
index 2d080522d6c..bbc55e66bd7 100644
--- a/sys/arch/arc/include/intr.h
+++ b/sys/arch/arc/include/intr.h
@@ -65,6 +65,8 @@ void setsoftnet   __P((void));
 void clearsoftnet __P((void));
 int  splsoftnet   __P((void));
 
+#define spllowersoftclock() splsoftclock()
+
 struct clockframe;
 void set_intr __P((int, int(*)(u_int, struct clockframe *), int));
 
diff --git a/sys/arch/atari/include/param.h b/sys/arch/atari/include/param.h
index 93b081463a2..06ca10f99ee 100644
--- a/sys/arch/atari/include/param.h
+++ b/sys/arch/atari/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.4 1997/02/28 22:57:36 niklas Exp $	*/
+/*	$OpenBSD: param.h,v 1.5 2000/07/06 15:25:02 ho Exp $	*/
 /*	$NetBSD: param.h,v 1.10 1996/01/07 22:30:41 leo Exp $	*/
 
 /*
@@ -188,11 +188,12 @@
 #define spl6()	_spl(PSL_S|PSL_IPL6)
 #define spl7()	_spl(PSL_S|PSL_IPL7)
 
-#define splnone()	spl0()
-#define splsoftclock()	spl1()
-#define splsoftnet()	spl1()
-#define splbio()	spl3()
-#define splnet()	spl3()
+#define splnone()		spl0()
+#define spllowersoftclock()	spl1()
+#define splsoftclock()		spl1()
+#define splsoftnet()		spl1()
+#define splbio()		spl3()
+#define splnet()		spl3()
 /*
  * lowered to spl4 to allow for serial input into
  * private ringbuffer inspite of spltty
diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h
index a61802df8bb..81cb2913207 100644
--- a/sys/arch/hp300/include/intr.h
+++ b/sys/arch/hp300/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.3 1999/05/04 19:57:25 millert Exp $	*/
+/*	$OpenBSD: intr.h,v 1.4 2000/07/06 15:25:03 ho Exp $	*/
 /*	$NetBSD: intr.h,v 1.2 1997/07/24 05:43:08 scottr Exp $	*/
 
 /*-
@@ -142,17 +142,18 @@ extern	unsigned short hp300_impipl;
 #define	splsoft()	spl1()
 
 /* These spl calls are used by machine-independent code. */
-#define	splsoftclock()	splsoft()
-#define	splsoftnet()	splsoft()
-#define	splbio()	_splraise(hp300_bioipl)
-#define	splnet()	_splraise(hp300_netipl)
-#define	spltty()	_splraise(hp300_ttyipl)
-#define	splimp()	_splraise(hp300_impipl)
-#define	splclock()	spl6()
-#define	splstatclock()	spl6()
-#define	splvm()		spl6()
-#define	splhigh()	spl7()
-#define	splsched()	spl7()
+#define	spllowersoftclock()	splsoft()
+#define	splsoftclock()		splsoft()
+#define	splsoftnet()		splsoft()
+#define	splbio()		_splraise(hp300_bioipl)
+#define	splnet()		_splraise(hp300_netipl)
+#define	spltty()		_splraise(hp300_ttyipl)
+#define	splimp()		_splraise(hp300_impipl)
+#define	splclock()		spl6()
+#define	splstatclock()		spl6()
+#define	splvm()			spl6()
+#define	splhigh()		spl7()
+#define	splsched()		spl7()
 
 /* watch out for side effects */
 #define	splx(s)		((s) & PSL_IPL ? _spl((s)) : spl0())
diff --git a/sys/arch/hppa/include/intr.h b/sys/arch/hppa/include/intr.h
index 78a0a4f6a9c..984ad0a5970 100644
--- a/sys/arch/hppa/include/intr.h
+++ b/sys/arch/hppa/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.8 1999/08/14 03:36:11 mickey Exp $	*/
+/*	$OpenBSD: intr.h,v 1.9 2000/07/06 15:25:03 ho Exp $	*/
 
 /* 
  * Copyright (c) 1990,1991,1992,1994 The University of Utah and
@@ -73,17 +73,18 @@
 	_ctl_r;								\
 })
 
-#define	spl0()		__spllow(IPL_NONE)
-#define	splsoft()	__spllow(IPL_CLOCK)
-#define	splsoftnet()	splsoft()
-#define	splsoftclock()	splsoft()
-#define	splbio()	__spllow(IPL_BIO)
-#define	splnet()	__spllow(IPL_NET)
-#define	spltty()	__spllow(IPL_TTY)
-#define	splimp()	__spllow(IPL_CLOCK)
-#define	splclock()	__spllow(IPL_CLOCK)
-#define	splstatclock()	__spllow(IPL_CLOCK)
-#define	splhigh()	__splhigh(IPL_HIGH)
+#define	spl0()			__spllow(IPL_NONE)
+#define	splsoft()		__spllow(IPL_CLOCK)
+#define	splsoftnet()		splsoft()
+#define	spllowersoftclock()	splsoft()
+#define	splsoftclock()		splsoft()
+#define	splbio()		__spllow(IPL_BIO)
+#define	splnet()		__spllow(IPL_NET)
+#define	spltty()		__spllow(IPL_TTY)
+#define	splimp()		__spllow(IPL_CLOCK)
+#define	splclock()		__spllow(IPL_CLOCK)
+#define	splstatclock()		__spllow(IPL_CLOCK)
+#define	splhigh()		__splhigh(IPL_HIGH)
 
 /* software interrupt register */
 extern u_int32_t sir;
diff --git a/sys/arch/kbus/include/psl.h b/sys/arch/kbus/include/psl.h
index 9d1b56aa143..d7cf31b71ae 100644
--- a/sys/arch/kbus/include/psl.h
+++ b/sys/arch/kbus/include/psl.h
@@ -173,8 +173,9 @@ setpil15 (void)
 extern int name __P((void)); 
 
 SPL(splsoftint, SPL_NET)
-#define	splsoftclock	splsoftint
-#define	splsoftnet	splsoftint
+#define	spllowersoftclock	splsoftint
+#define	splsoftclock		splsoftint
+#define	splsoftnet		splsoftint
 
 /* Block devices */
 SPL(splbio, SPL_BIO)
diff --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h
index 54ba90fc471..c5e6b7d3a92 100644
--- a/sys/arch/mac68k/include/intr.h
+++ b/sys/arch/mac68k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.2 1999/06/11 04:48:11 downsj Exp $	*/
+/*	$OpenBSD: intr.h,v 1.3 2000/07/06 15:25:03 ho Exp $	*/
 /*	$NetBSD: intr.h,v 1.8 1997/11/07 07:33:18 scottr Exp $	*/
 
 /*
@@ -101,17 +101,18 @@ extern unsigned short	mac68k_schedipl;
  * everything at spl2, and everything but the panic switch and
  * power at spl4.
  */
-#define	splsoftclock()	splsoft()
-#define	splsoftnet()	splsoft()
-#define	spltty()	_splraise(mac68k_ttyipl)
-#define	splbio()	_splraise(mac68k_bioipl)
-#define	splnet()	_splraise(mac68k_netipl)
-#define	splimp()	_splraise(mac68k_impipl)
-#define	splclock()	_splraise(mac68k_clockipl)
-#define	splstatclock()	_splraise(mac68k_statclockipl)
-#define	splsched()	_splsched(mac68k_schedipl)
-#define	splserial()	spl4()
-#define	splhigh()	spl7()
+#define	spllowersoftclock()	splsoft()
+#define	splsoftclock()		splsoft()
+#define	splsoftnet()		splsoft()
+#define	spltty()		_splraise(mac68k_ttyipl)
+#define	splbio()		_splraise(mac68k_bioipl)
+#define	splnet()		_splraise(mac68k_netipl)
+#define	splimp()		_splraise(mac68k_impipl)
+#define	splclock()		_splraise(mac68k_clockipl)
+#define	splstatclock()		_splraise(mac68k_statclockipl)
+#define	splsched()		_splsched(mac68k_schedipl)
+#define	splserial()		spl4()
+#define	splhigh()		spl7()
 
 /* watch out for side effects */
 #define splx(s)         ((s) & PSL_IPL ? _spl(s) : spl0())
diff --git a/sys/arch/mvme68k/include/intr.h b/sys/arch/mvme68k/include/intr.h
index 2fc1cde265a..64df806d666 100644
--- a/sys/arch/mvme68k/include/intr.h
+++ b/sys/arch/mvme68k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.1 2000/01/06 03:27:00 smurph Exp $	*/
+/*	$OpenBSD: intr.h,v 1.2 2000/07/06 15:25:04 ho Exp $	*/
 /*
  * Copyright (C) 2000 Steve Murphree, Jr.
  * All rights reserved.
@@ -62,16 +62,17 @@ u_long	allocate_sir __P((void (*proc)(), void *arg));
 #define	spl6()	_spl(PSL_S|PSL_IPL6)
 #define	spl7()	_spl(PSL_S|PSL_IPL7)
 
-#define	splsoftclock()	spl1()
-#define	splsoftnet()	spl1()
-#define	splbio()	spl2()
-#define	splnet()	spl3()
-#define	splimp()	spl3()
-#define	spltty()	spl3()
-#define	splclock()	spl5()
-#define	splstatclock()	spl5()
-#define	splhigh()	spl7()
-#define	splsched()	spl7()
+#define	spllowersoftclock()	spl1()
+#define	splsoftclock()		spl1()
+#define	splsoftnet()		spl1()
+#define	splbio()		spl2()
+#define	splnet()		spl3()
+#define	splimp()		spl3()
+#define	spltty()		spl3()
+#define	splclock()		spl5()
+#define	splstatclock()		spl5()
+#define	splhigh()		spl7()
+#define	splsched()		spl7()
 
 /* watch out for side effects */
 #define	splx(s)		(s & PSL_IPL ? _spl(s) : spl0())
diff --git a/sys/arch/mvme88k/include/psl.h b/sys/arch/mvme88k/include/psl.h
index 98112abfb8f..63f7ff51dc5 100644
--- a/sys/arch/mvme88k/include/psl.h
+++ b/sys/arch/mvme88k/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.4 1999/02/09 06:36:27 smurph Exp $ */
+/*	$OpenBSD: psl.h,v 1.5 2000/07/06 15:25:04 ho Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -82,18 +82,19 @@ above...
 #define IPL_NMI		7
 #define IPL_ABORT	7
 
-#define splnone		spl0
-#define splsoftclock()	setipl(IPL_SOFTCLOCK)
-#define splsoftnet()	setipl(IPL_SOFTNET)
-#define splbio()	setipl(IPL_BIO)
-#define splnet()	setipl(IPL_NET)
-#define spltty()	setipl(IPL_TTY)
-#define splclock()	setipl(IPL_CLOCK)
-#define splstatclock()	setipl(IPL_STATCLOCK)
-#define splimp()	setipl(IPL_IMP)
-#define splvm()		setipl(IPL_VM)
-#define splhigh()	setipl(IPL_HIGH)
-#define splsched()	setipl(IPL_SCHED)
+#define splnone			spl0
+#define spllowersoftclock()	setipl(IPL_SOFTCLOCK)
+#define splsoftclock()		setipl(IPL_SOFTCLOCK)
+#define splsoftnet()		setipl(IPL_SOFTNET)
+#define splbio()		setipl(IPL_BIO)
+#define splnet()		setipl(IPL_NET)
+#define spltty()		setipl(IPL_TTY)
+#define splclock()		setipl(IPL_CLOCK)
+#define splstatclock()		setipl(IPL_STATCLOCK)
+#define splimp()		setipl(IPL_IMP)
+#define splvm()			setipl(IPL_VM)
+#define splhigh()		setipl(IPL_HIGH)
+#define splsched()		setipl(IPL_SCHED)
 
 #define splx(x)		((x) ? setipl((x)) : spl0())
 
diff --git a/sys/arch/pmax/include/mips_param.h b/sys/arch/pmax/include/mips_param.h
index 60212a77fc0..7c89ca5acc2 100644
--- a/sys/arch/pmax/include/mips_param.h
+++ b/sys/arch/pmax/include/mips_param.h
@@ -60,6 +60,7 @@
 #ifndef _LOCORE
 typedef int spl_t;
 extern spl_t splx __P((spl_t));
+#define spllowersoftclock splsoftclock
 extern spl_t splsoftnet __P((void)), splsoftclock __P((void));
 extern spl_t splhigh __P((void));
 extern spl_t spl0 __P((void));	/* XXX should not enable TC on 3min */
diff --git a/sys/arch/sparc/include/psl.h b/sys/arch/sparc/include/psl.h
index 70507bdd7ff..6ac4e0c7081 100644
--- a/sys/arch/sparc/include/psl.h
+++ b/sys/arch/sparc/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.3 1997/08/08 08:26:41 downsj Exp $	*/
+/*	$OpenBSD: psl.h,v 1.4 2000/07/06 15:25:04 ho Exp $	*/
 /*	$NetBSD: psl.h,v 1.12 1997/03/10 21:49:11 pk Exp $ */
 
 /*
@@ -172,8 +172,9 @@ static __inline int name() \
 }
 
 SPL(splsoftint, 1)
-#define	splsoftclock	splsoftint
-#define	splsoftnet	splsoftint
+#define	spllowersoftclock	splsoftint
+#define	splsoftclock		splsoftint
+#define	splsoftnet		splsoftint
 
 /* audio software interrupts are at software level 4 */
 #define	PIL_AUSOFT	4
diff --git a/sys/arch/sun3/include/param.h b/sys/arch/sun3/include/param.h
index fb5876208b7..e549bf0be83 100644
--- a/sys/arch/sun3/include/param.h
+++ b/sys/arch/sun3/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.19 2000/04/30 15:29:47 miod Exp $	*/
+/*	$OpenBSD: param.h,v 1.20 2000/07/06 15:25:04 ho Exp $	*/
 /*	$NetBSD: param.h,v 1.34 1996/03/04 05:04:40 cgd Exp $	*/
 
 /*
@@ -132,8 +132,9 @@
 #define splx(x)  _spl(x)
 
 /* IPL used by soft interrupts: netintr(), softclock() */
-#define splsoftclock()  spl1()
-#define splsoftnet()    spl1()
+#define spllowersoftclock() spl1()
+#define splsoftclock()      spl1()
+#define splsoftnet()        spl1()
 
 /* Highest block device (strategy) IPL. */
 #define splbio()        spl2()