summaryrefslogtreecommitdiff
path: root/sys/arch/sun3/include/param.h
diff options
context:
space:
mode:
authorkstailey <kstailey@cvs.openbsd.org>1997-02-14 23:50:21 +0000
committerkstailey <kstailey@cvs.openbsd.org>1997-02-14 23:50:21 +0000
commit05a12aee2d76339b83614fd0d377c4a31d49bbb7 (patch)
tree6da88fc4c1b37859669551cceb26ff86927fe082 /sys/arch/sun3/include/param.h
parentd40be87b27a714db7a459a0e6d4dcdad7814aea5 (diff)
back out changes to rei function
Diffstat (limited to 'sys/arch/sun3/include/param.h')
-rw-r--r--sys/arch/sun3/include/param.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/arch/sun3/include/param.h b/sys/arch/sun3/include/param.h
index e331b93b7e5..b9884ddb106 100644
--- a/sys/arch/sun3/include/param.h
+++ b/sys/arch/sun3/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.12 1997/02/14 19:24:05 kstailey Exp $ */
+/* $OpenBSD: param.h,v 1.13 1997/02/14 23:50:18 kstailey Exp $ */
/* $NetBSD: param.h,v 1.34 1996/03/04 05:04:40 cgd Exp $ */
/*
@@ -150,7 +150,7 @@
#define sun3_ptob(x) ((unsigned)(x) << PGSHIFT)
/*
- * spl functions; all but spl0 are done in-line
+ * spl functions; all are done in-line
*/
#include <machine/psl.h>
@@ -171,6 +171,7 @@
* have no need to check for any simulated interrupts, etc.
*/
+#define spl0() _spl(PSL_S|PSL_IPL0)
#define spl1() _spl(PSL_S|PSL_IPL1)
#define spl2() _spl(PSL_S|PSL_IPL2)
#define spl3() _spl(PSL_S|PSL_IPL3)
@@ -178,6 +179,7 @@
#define spl5() _spl(PSL_S|PSL_IPL5)
#define spl6() _spl(PSL_S|PSL_IPL6)
#define spl7() _spl(PSL_S|PSL_IPL7)
+#define splx(x) _spl(x)
/* IPL used by soft interrupts: netintr(), softclock() */
#define splsoftclock() spl1()
@@ -206,11 +208,6 @@
#define splhigh() spl7()
#define splsched() spl7()
-void spl0 __P((void)); /* XXX where should this go? */
-
-/* watch out for side effects */
-#define splx(s) (s & PSL_IPL ? _spl(s) : spl0())
-
/* Get current sr value (debug, etc.) */
extern int getsr __P((void));