diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-05-01 09:55:50 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-05-01 09:55:50 +0000 |
| commit | 5f77a732972cb1329a2fd64dd2fe6540c1dfbee6 (patch) | |
| tree | 1923315eff03edf7109969e6cd13e2e68f0c871e /sys/arch/m88k/include/intr.h | |
| parent | 6e9804297a3ff083bc61d8f4b088f1d2766a559d (diff) | |
Bring raise-only semantics to splsoft* on m68k and m88k, as done elsewhere.
Diffstat (limited to 'sys/arch/m88k/include/intr.h')
| -rw-r--r-- | sys/arch/m88k/include/intr.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/sys/arch/m88k/include/intr.h b/sys/arch/m88k/include/intr.h index 59871103575..7e84945af50 100644 --- a/sys/arch/m88k/include/intr.h +++ b/sys/arch/m88k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.2 2005/04/19 15:29:47 mickey Exp $ */ +/* $OpenBSD: intr.h,v 1.3 2005/05/01 09:55:49 miod Exp $ */ /* * Copyright (C) 2000 Steve Murphree, Jr. * All rights reserved. @@ -35,8 +35,6 @@ unsigned setipl(unsigned level); unsigned raiseipl(unsigned level); int spl0(void); -/* needs major cleanup - XXX nivas */ - /* SPL asserts */ #ifdef DIAGNOSTIC /* @@ -57,17 +55,9 @@ void splassert_check(int, const char *); #endif /* _LOCORE */ -#define spl1() setipl(1) -#define spl2() setipl(2) -#define spl3() setipl(3) -#define spl4() setipl(4) -#define spl5() setipl(5) -#define spl6() setipl(6) -#define spl7() setipl(7) - #define splnone spl0 -#define splsoftclock() setipl(IPL_SOFTCLOCK) -#define splsoftnet() setipl(IPL_SOFTNET) +#define splsoftclock() raiseipl(IPL_SOFTCLOCK) +#define splsoftnet() raiseipl(IPL_SOFTNET) #define splbio() raiseipl(IPL_BIO) #define splnet() raiseipl(IPL_NET) #define spltty() raiseipl(IPL_TTY) @@ -77,7 +67,7 @@ void splassert_check(int, const char *); #define splvm() raiseipl(IPL_VM) #define splhigh() setipl(IPL_HIGH) -#define splx(x) ((x) ? setipl((x)) : spl0()) +#define splx(x) ((x) ? setipl((x)) : spl0()) #endif /* _KERNEL */ #endif /* _MVME88K_INTR_H_ */ |