Moved splq() to isa/ipl_funcs.c for SMP only.

This is in preperation for moving all cpl accesses behind a critical region lock.

2 files changed, 8 insertions, 3 deletions

diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index 3801665..ad62dd4 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: kern_intr.c,v 1.8 1997/07/09 18:06:25 ache Exp $
+ * $Id: kern_intr.c,v 1.9 1997/08/02 14:31:27 bde Exp $
  *
  */
 
@@ -57,9 +57,10 @@ typedef struct intrec {
 /*
  * The interrupt multiplexer calls each of the handlers in turn,
  * and applies the associated interrupt mask to "cpl", which is
- * defined as a ".long" in /sys/i386/isa/icu.s
+ * defined as a ".long" in /sys/i386/isa/ipl.s
  */
 
+#ifndef SMP
 static inline intrmask_t
 splq(intrmask_t mask)
 {
@@ -67,6 +68,7 @@ splq(intrmask_t mask)
 	cpl |= mask;
 	return (tmp);
 }
+#endif /* SMP */
 
 static void
 intr_mux(void *arg)
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 6ffabe2..448fdde 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $Id: systm.h,v 1.54 1997/08/09 00:04:06 dyson Exp $
+ * $Id: systm.h,v 1.1 1997/08/19 20:10:18 smp Exp smp $
  */
 
 #ifndef _SYS_SYSTM_H_
@@ -181,6 +181,9 @@ intrmask_t	splclock(void);
 intrmask_t	splhigh(void);
 intrmask_t	splimp(void);
 intrmask_t	splnet(void);
+#ifdef SMP
+intrmask_t	splq(intrmask_t mask);
+#endif
 intrmask_t	splsoftclock(void);
 intrmask_t	splsofttty(void);
 intrmask_t	splstatclock(void);