Index: luna88k/cbus/cbus.c
===================================================================
RCS file: /cvs/src/sys/arch/luna88k/cbus/cbus.c,v
retrieving revision 1.5
diff -u -p -r1.5 cbus.c
--- luna88k/cbus/cbus.c	3 Mar 2015 23:50:36 -0000	1.5
+++ luna88k/cbus/cbus.c	13 Jun 2016 01:39:37 -0000
@@ -252,7 +252,7 @@ cbus_isrdispatch(int intlevel)
 		return;
 	}
 
-	s = raiseipl(ci->isr_ipl);	/* splraise() */
+	s = splraise(ci->isr_ipl);
 	rc = ci->isr_func(ci->isr_arg);
 	splx(s);
 
Index: luna88k/luna88k/machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/luna88k/luna88k/machdep.c,v
retrieving revision 1.118
diff -u -p -r1.118 machdep.c
--- luna88k/luna88k/machdep.c	21 Oct 2015 07:59:18 -0000	1.118
+++ luna88k/luna88k/machdep.c	13 Jun 2016 01:39:37 -0000
@@ -1261,7 +1261,7 @@ setipl(int level)
 }
 
 int
-raiseipl(int level)
+splraise(int level)
 {
 	u_int curspl, psr;
 #ifdef MULTIPROCESSOR
Index: m88k/include/intr.h
===================================================================
RCS file: /cvs/src/sys/arch/m88k/include/intr.h,v
retrieving revision 1.12
diff -u -p -r1.12 intr.h
--- m88k/include/intr.h	21 Dec 2010 14:56:24 -0000	1.12
+++ m88k/include/intr.h	13 Jun 2016 01:39:37 -0000
@@ -67,7 +67,7 @@
 #ifndef _LOCORE
 int	getipl(void);
 int	setipl(int level);
-int	raiseipl(int level);
+int	splraise(int);
 int	spl0(void);
 
 /* SPL asserts */
@@ -92,15 +92,15 @@ void splassert_check(int, const char *);
 
 #endif /* _LOCORE */
 
-#define splsoftclock()		raiseipl(IPL_SOFTINT)
-#define splsoftnet()		raiseipl(IPL_SOFTINT)
-#define splbio()		raiseipl(IPL_BIO)
-#define splnet()		raiseipl(IPL_NET)
-#define spltty()		raiseipl(IPL_TTY)
-#define splclock()		raiseipl(IPL_CLOCK)
-#define splstatclock()		raiseipl(IPL_STATCLOCK)
-#define	splsched()		raiseipl(IPL_SCHED)
-#define splvm()			raiseipl(IPL_VM)
+#define splsoftclock()		splraise(IPL_SOFTINT)
+#define splsoftnet()		splraise(IPL_SOFTINT)
+#define splbio()		splraise(IPL_BIO)
+#define splnet()		splraise(IPL_NET)
+#define spltty()		splraise(IPL_TTY)
+#define splclock()		splraise(IPL_CLOCK)
+#define splstatclock()		splraise(IPL_STATCLOCK)
+#define	splsched()		splraise(IPL_SCHED)
+#define splvm()			splraise(IPL_VM)
 #define splhigh()		setipl(IPL_HIGH)
 
 #define	spllock()		splhigh()
Index: m88k/m88k/mutex.S
===================================================================
RCS file: /cvs/src/sys/arch/m88k/m88k/mutex.S,v
retrieving revision 1.14
diff -u -p -r1.14 mutex.S
--- m88k/m88k/mutex.S	3 Jul 2015 15:12:49 -0000	1.14
+++ m88k/m88k/mutex.S	13 Jun 2016 01:39:37 -0000
@@ -55,7 +55,7 @@ ENTRY(mtx_enter)
 enter_again:
 	ld	%r2,  %r2,  MTX_WANTIPL
 	bcnd	eq0,  %r2,  1f
-	bsr	_C_LABEL(raiseipl)	/* raiseipl(mtx->mtx_wantipl) */
+	bsr	_C_LABEL(splraise)	/* splraise(mtx->mtx_wantipl) */
 1:
 	ld	%r4,  %r31, 0
 	or	%r3,  %r0,  1
@@ -112,7 +112,7 @@ enter_panic:
 	st	%r2,  %r31, 0		/* save mtx */
 	ld	%r2,  %r2,  MTX_WANTIPL
 	bcnd	eq0,  %r2,  1f
-	bsr	_C_LABEL(raiseipl)	/* raiseipl(mtx->mtx_wantipl) */
+	bsr	_C_LABEL(splraise)	/* splraise(mtx->mtx_wantipl) */
 1:
 	ld	%r4,  %r31, 0
 	ldcr	%r3,  CPU
@@ -148,7 +148,7 @@ ENTRY(mtx_enter_try)
 enter_try_again:
 	ld	%r2,  %r2,  MTX_WANTIPL
 	bcnd	eq0,  %r2,  1f
-	bsr	_C_LABEL(raiseipl)	/* raiseipl(mtx->mtx_wantipl) */
+	bsr	_C_LABEL(splraise)	/* splraise(mtx->mtx_wantipl) */
 1:
 	ld	%r4,  %r31, 0
 	or	%r3,  %r0,  1
@@ -205,7 +205,7 @@ enter_try_panic:
 	st	%r2,  %r31, 0		/* save mtx */
 	ld	%r2,  %r2,  MTX_WANTIPL
 	bcnd	eq0,  %r2,  1f
-	bsr	_C_LABEL(raiseipl)	/* raiseipl(mtx->mtx_wantipl) */
+	bsr	_C_LABEL(splraise)	/* splraise(mtx->mtx_wantipl) */
 1:
 	ld	%r4,  %r31, 0
 	ldcr	%r3,  CPU
Index: m88k/m88k/trap.c
===================================================================
RCS file: /cvs/src/sys/arch/m88k/m88k/trap.c,v
retrieving revision 1.103
diff -u -p -r1.103 trap.c
--- m88k/m88k/trap.c	13 Sep 2015 11:32:29 -0000	1.103
+++ m88k/m88k/trap.c	13 Jun 2016 01:39:37 -0000
@@ -1629,7 +1629,7 @@ splassert_check(int wantipl, const char 
 		 * This will raise the spl,
 		 * in a feeble attempt to reduce further damage.
 		 */
-		(void)raiseipl(wantipl);
+		(void)splraise(wantipl);
 	}
 }
 #endif