rename raiseipl to splraise()

another step toward making splraise an MI api.

ok aoyama@

5 files changed, 22 insertions, 22 deletions

diff --git a/sys/arch/luna88k/cbus/cbus.c b/sys/arch/luna88k/cbus/cbus.c
index 5775d8d8e97..167d51a454a 100644
--- a/sys/arch/luna88k/cbus/cbus.c
+++ b/sys/arch/luna88k/cbus/cbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cbus.c,v 1.5 2015/03/03 23:50:36 aoyama Exp $	*/
+/*	$OpenBSD: cbus.c,v 1.6 2016/06/13 23:51:58 dlg Exp $	*/
 
 /*
  * Copyright (c) 2014 Kenji Aoyama.
@@ -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);
 
diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index 32df516c412..e85e40e8f1c 100644
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.118 2015/10/21 07:59:18 mpi Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.119 2016/06/13 23:51:58 dlg Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -1261,7 +1261,7 @@ setipl(int level)
 }
 
 int
-raiseipl(int level)
+splraise(int level)
 {
 	u_int curspl, psr;
 #ifdef MULTIPROCESSOR
diff --git a/sys/arch/m88k/include/intr.h b/sys/arch/m88k/include/intr.h
index 9b1b9c0c5a1..ecfeb16906f 100644
--- a/sys/arch/m88k/include/intr.h
+++ b/sys/arch/m88k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.12 2010/12/21 14:56:24 claudio Exp $	*/
+/*	$OpenBSD: intr.h,v 1.13 2016/06/13 23:51:59 dlg Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
@@ -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()
diff --git a/sys/arch/m88k/m88k/mutex.S b/sys/arch/m88k/m88k/mutex.S
index aed2cc9f189..5f0fee2edc5 100644
--- a/sys/arch/m88k/m88k/mutex.S
+++ b/sys/arch/m88k/m88k/mutex.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mutex.S,v 1.14 2015/07/03 15:12:49 miod Exp $	*/
+/*	$OpenBSD: mutex.S,v 1.15 2016/06/13 23:51:59 dlg Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat.
@@ -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
diff --git a/sys/arch/m88k/m88k/trap.c b/sys/arch/m88k/m88k/trap.c
index d11f8ca1992..0e0c3ab1bbc 100644
--- a/sys/arch/m88k/m88k/trap.c
+++ b/sys/arch/m88k/m88k/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.103 2015/09/13 11:32:29 miod Exp $	*/
+/*	$OpenBSD: trap.c,v 1.104 2016/06/13 23:51:59 dlg Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  * Copyright (c) 1998 Steve Murphree, Jr.
@@ -1629,7 +1629,7 @@ splassert_check(int wantipl, const char *func)
 		 * This will raise the spl,
 		 * in a feeble attempt to reduce further damage.
 		 */
-		(void)raiseipl(wantipl);
+		(void)splraise(wantipl);
 	}
 }
 #endif