Index: alpha/interrupt.c =================================================================== RCS file: /cvs/src/sys/arch/alpha/alpha/interrupt.c,v retrieving revision 1.37 diff -u -p -r1.37 interrupt.c --- alpha/interrupt.c 13 Sep 2015 20:37:28 -0000 1.37 +++ alpha/interrupt.c 7 Jun 2016 03:29:22 -0000 @@ -602,7 +602,7 @@ intr_barrier(void *cookie) } int -_splraise(int s) +splraise(int s) { int cur = alpha_pal_rdps() & ALPHA_PSL_IPL_MASK; return (s > cur ? alpha_pal_swpipl(s) : cur); Index: alpha/mutex.c =================================================================== RCS file: /cvs/src/sys/arch/alpha/alpha/mutex.c,v retrieving revision 1.15 diff -u -p -r1.15 mutex.c --- alpha/mutex.c 21 Sep 2015 05:38:58 -0000 1.15 +++ alpha/mutex.c 7 Jun 2016 03:29:22 -0000 @@ -58,7 +58,7 @@ mtx_enter_try(struct mutex *mtx) int s; if (mtx->mtx_wantipl != IPL_NONE) - s = _splraise(mtx->mtx_wantipl); + s = splraise(mtx->mtx_wantipl); owner = atomic_cas_ptr(&mtx->mtx_owner, NULL, ci); #ifdef DIAGNOSTIC @@ -91,7 +91,7 @@ mtx_enter(struct mutex *mtx) panic("mtx %p: locking against myself", mtx); #endif if (mtx->mtx_wantipl != IPL_NONE) - mtx->mtx_oldipl = _splraise(mtx->mtx_wantipl); + mtx->mtx_oldipl = splraise(mtx->mtx_wantipl); mtx->mtx_owner = ci; Index: include/intr.h =================================================================== RCS file: /cvs/src/sys/arch/alpha/include/intr.h,v retrieving revision 1.45 diff -u -p -r1.45 intr.h --- include/intr.h 13 Sep 2015 20:37:28 -0000 1.45 +++ include/intr.h 7 Jun 2016 03:29:22 -0000 @@ -169,23 +169,23 @@ void splassert_check(int, const char *); ((s) == ALPHA_PSL_IPL_0 ? spl0() : alpha_pal_swpipl(s)) /* IPL-raising functions/macros */ -int _splraise(int); +int splraise(int); -#define splsoft() _splraise(IPL_SOFTINT) +#define splsoft() splraise(IPL_SOFTINT) #define splsoftserial() splsoft() #define splsoftclock() splsoft() #define splsoftnet() splsoft() -#define splnet() _splraise(IPL_NET) -#define splbio() _splraise(IPL_BIO) -#define spltty() _splraise(IPL_TTY) -#define splserial() _splraise(IPL_SERIAL) -#define splaudio() _splraise(IPL_AUDIO) -#define splvm() _splraise(IPL_VM) -#define splclock() _splraise(IPL_CLOCK) -#define splstatclock() _splraise(IPL_CLOCK) -#define splsched() _splraise(IPL_SCHED) -#define splipi() _splraise(IPL_IPI) -#define splhigh() _splraise(IPL_HIGH) +#define splnet() splraise(IPL_NET) +#define splbio() splraise(IPL_BIO) +#define spltty() splraise(IPL_TTY) +#define splserial() splraise(IPL_SERIAL) +#define splaudio() splraise(IPL_AUDIO) +#define splvm() splraise(IPL_VM) +#define splclock() splraise(IPL_CLOCK) +#define splstatclock() splraise(IPL_CLOCK) +#define splsched() splraise(IPL_SCHED) +#define splipi() splraise(IPL_IPI) +#define splhigh() splraise(IPL_HIGH) #define spllock() splhigh()