Change splsoftclock() to raise the spl, instead of lowering it.

Add spllowersoftclock() for the former behaviour. Update comment. (art@ ok)

5 files changed, 21 insertions, 16 deletions

diff --git a/sys/arch/amiga/include/psl.h b/sys/arch/amiga/include/psl.h
index a966e90f50d..63c4bcf27d9 100644
--- a/sys/arch/amiga/include/psl.h
+++ b/sys/arch/amiga/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.10 1999/05/10 16:24:55 espie Exp $	*/
+/*	$OpenBSD: psl.h,v 1.11 2000/07/06 15:29:52 ho Exp $	*/
 /*	$NetBSD: psl.h,v 1.11 1996/11/30 00:33:49 is Exp $	*/
 
 #ifndef _MACHINE_PSL_H_
@@ -132,12 +132,13 @@ extern u_int16_t amiga_ttyspl;
 /*
  * Software interrupt masks
  *
- * NOTE: splsoftclock() is used by hardclock() to lower the priority from
+ * NOTE: spllowersoftclock() is used by hardclock() to lower the priority from
  * clock to softclock before it calls softclock().
  */
-#define splsoftclock()	spllower(PSL_S|PSL_IPL1)
-#define splsoftnet()	spl1()
-#define splsofttty()	spl1()
+#define spllowersoftclock()	spllower(PSL_S|PSL_IPL1)
+#define splsoftclock()		spl1()
+#define splsoftnet()		spl1()
+#define splsofttty()		spl1()
 
 /*
  * Miscellaneous
diff --git a/sys/arch/i386/include/intr.h b/sys/arch/i386/include/intr.h
index 9c8cadb7166..2a508e5ab7a 100644
--- a/sys/arch/i386/include/intr.h
+++ b/sys/arch/i386/include/intr.h
@@ -128,12 +128,13 @@ spllower(ncpl)
 /*
  * Software interrupt masks
  *
- * NOTE: splsoftclock() is used by hardclock() to lower the priority from
+ * NOTE: spllowersoftclock() is used by hardclock() to lower the priority from
  * clock to softclock before it calls softclock().
  */
-#define	splsoftclock()	spllower(SIR_CLOCKMASK)
-#define	splsoftnet()	splraise(SIR_NETMASK)
-#define	splsofttty()	splraise(SIR_TTYMASK)
+#define	spllowersoftclock()	spllower(SIR_CLOCKMASK)
+#define	splsoftclock()		splraise(SIR_CLOCKMASK)
+#define	splsoftnet()		splraise(SIR_NETMASK)
+#define	splsofttty()		splraise(SIR_TTYMASK)
 
 /*
  * Miscellaneous
diff --git a/sys/arch/pc532/include/psl.h b/sys/arch/pc532/include/psl.h
index e9bbaca6d68..3cc8449b1df 100644
--- a/sys/arch/pc532/include/psl.h
+++ b/sys/arch/pc532/include/psl.h
@@ -213,11 +213,12 @@ splx_di(register int ncpl)
 /*
  * Software interrupt masks
  *
- * NOTE: splsoftclock() is used by hardclock() to lower the priority from
+ * NOTE: spllowersoftclock() is used by hardclock() to lower the priority from
  * clock to softclock before it calls softclock().
  */
-#define	splsoftclock()	splx(SIR_CLOCKMASK|imask[IPL_ZERO])
-#define	splsoftnet()	splraise(SIR_NETMASK)
+#define	spllowersoftclock()	splx(SIR_CLOCKMASK|imask[IPL_ZERO])
+#define	splsoftclock()		splraise(SIR_CLOCKMASK)
+#define	splsoftnet()		splraise(SIR_NETMASK)
 
 /*
  * Miscellaneous
diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h
index 5cc731aa217..f2387c0a9fe 100644
--- a/sys/arch/powerpc/include/intr.h
+++ b/sys/arch/powerpc/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.5 2000/03/31 04:16:34 rahnds Exp $ */
+/*	$OpenBSD: intr.h,v 1.6 2000/07/06 15:29:53 ho Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
@@ -137,7 +137,8 @@ set_sint(pending)
 #define splclock()	splraise(SPL_CLOCK|SINT_MASK)
 #define splimp()	splraise(imask[IPL_IMP])
 #define splstatclock()	splhigh()
-#define	splsoftclock()	spllower(SINT_CLOCK)
+#define	spllowersoftclock()	spllower(SINT_CLOCK)
+#define	splsoftclock()	splraise(SINT_CLOCK)
 #define	splsoftnet()	splraise(SINT_NET)
 #define	splsofttty()	splraise(SINT_TTY)
 
diff --git a/sys/arch/wgrisc/include/intr.h b/sys/arch/wgrisc/include/intr.h
index 67e7ad75ff1..ed48fcbed03 100644
--- a/sys/arch/wgrisc/include/intr.h
+++ b/sys/arch/wgrisc/include/intr.h
@@ -127,10 +127,11 @@ spllower(ncpl)
 /*
  * Software interrupt masks
  *
- * NOTE: splsoftclock() is used by hardclock() to lower the priority from
+ * NOTE: spllowersoftclock() is used by hardclock() to lower the priority from
  * clock to softclock before it calls softclock().
  */
-#define	splsoftclock()	spllower(SIR_CLOCKMASK)
+#define	spllowersoftclock()	spllower(SIR_CLOCKMASK)
+#define	splsoftclock()	splraise(SIR_CLOCKMASK)
 #define	splsoftnet()	splraise(SIR_NETMASK)
 #define	splsofttty()	splraise(SIR_TTYMASK)