[src/netbsd-1-5]: src/sys/arch/sh3/include Pullup revision 1.6 (approved by t...

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

details:   https://anonhg.NetBSD.org/src/rev/9755175653ab
branches:  netbsd-1-5
changeset: 488971:9755175653ab
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Aug 08 18:26:40 2000 +0000

description:
Pullup revision 1.6 (approved by thorpej):

fix the return value of the spllower() to void.

diffstat:

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

diffs (59 lines):

diff -r 5747b26e83f3 -r 9755175653ab sys/arch/sh3/include/intr.h
--- a/sys/arch/sh3/include/intr.h       Tue Aug 08 17:20:46 2000 +0000
+++ b/sys/arch/sh3/include/intr.h       Tue Aug 08 18:26:40 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.5 2000/04/13 15:36:10 msaitoh Exp $ */
+/*     $NetBSD: intr.h,v 1.5.4.1 2000/08/08 18:26:40 msaitoh Exp $     */
 
 /*
  * Copyright (c) 1996, 1997 Charles M. Hannum.  All rights reserved.
@@ -52,8 +52,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));
 
 /*
@@ -76,7 +75,7 @@
  * interrupts are pending, call Xspllower() to process them.
  */
 static __inline void
-splx(ncpl)
+spllower(ncpl)
        register int ncpl;
 {
 
@@ -86,22 +85,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])
@@ -129,6 +112,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