[src/trunk]: src/sys/arch/i386/include make spl-lowering functions return void.

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e720a8750166
branches:  trunk
changeset: 487517:e720a8750166
user:      cgd <cgd%NetBSD.org@localhost>
date:      Thu Jun 08 23:03:13 2000 +0000

description:
make spl-lowering functions return void.

diffstat:

 sys/arch/i386/include/intr.h |  24 ++++--------------------
 1 files changed, 4 insertions(+), 20 deletions(-)

diffs (59 lines):

diff -r 5f42a70043f6 -r e720a8750166 sys/arch/i386/include/intr.h
--- a/sys/arch/i386/include/intr.h      Thu Jun 08 23:01:22 2000 +0000
+++ b/sys/arch/i386/include/intr.h      Thu Jun 08 23:03:13 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.13 2000/06/04 21:27:40 mycroft Exp $        */
+/*     $NetBSD: intr.h,v 1.14 2000/06/08 23:03:13 cgd Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -76,8 +76,7 @@
 extern void Xspllower __P((void));
 
 static __inline int splraise __P((int));
-static __inline int spllower __P((int));
-static __inline void splx __P((int));
+static __inline void spllower __P((int));
 static __inline void softintr __P((int));
 
 /*
@@ -98,7 +97,7 @@
  * interrupts are pending, call Xspllower() to process them.
  */
 static __inline void
-splx(ncpl)
+spllower(ncpl)
        register int ncpl;
 {
 
@@ -108,22 +107,6 @@
 }
 
 /*
- * Same as splx(), but we return the old value of spl, for the
- * benefit of some splsoftclock() callers.
- */
-static __inline int
-spllower(ncpl)
-       register int ncpl;
-{
-       register int ocpl = cpl;
-
-       cpl = ncpl;
-       if (ipending & ~ncpl)
-               Xspllower();
-       return (ocpl);
-}
-
-/*
  * Hardware interrupt masks
  */
 #define        splbio()        splraise(imask[IPL_BIO])
@@ -153,6 +136,7 @@
 #define        splimp()        splraise(imask[IPL_IMP])
 #define        splhigh()       splraise(imask[IPL_HIGH])
 #define        spl0()          spllower(0)
+#define        splx(x)         spllower(x)
 
 /*
  * Software interrupt registration