From 5400ed3b2ff35f8df614139fda42e924a74109e3 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 31 May 1997 09:27:31 +0000
Subject: [PATCH] Include file updates..  <machine/spl.h> -> <machine/ipl.h>,
 add <machine/ipl.h> to those files that were depending on getting SWI_*
 implicitly via <machine/cpufunc.h>

---
 sys/amd64/amd64/cpu_switch.S | 4 ++--
 sys/amd64/amd64/exception.S  | 4 ++--
 sys/amd64/amd64/exception.s  | 4 ++--
 sys/amd64/amd64/fpu.c        | 5 +++--
 sys/amd64/amd64/swtch.s      | 4 ++--
 sys/amd64/amd64/trap.c       | 3 ++-
 sys/amd64/amd64/tsc.c        | 3 ++-
 sys/amd64/isa/clock.c        | 3 ++-
 sys/amd64/isa/isa.c          | 3 ++-
 sys/amd64/isa/npx.c          | 5 +++--
 sys/i386/i386/exception.s    | 4 ++--
 sys/i386/i386/swtch.s        | 4 ++--
 sys/i386/i386/trap.c         | 3 ++-
 sys/i386/i386/tsc.c          | 3 ++-
 sys/i386/isa/clock.c         | 3 ++-
 sys/i386/isa/isa.c           | 3 ++-
 sys/i386/isa/npx.c           | 5 +++--
 sys/isa/atrtc.c              | 3 ++-
 sys/kern/subr_trap.c         | 3 ++-
 19 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index 66d462687bc..094e75b2675 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.49 1997/04/28 08:39:48 fsmp Exp $
+ *	$Id: swtch.s,v 1.50 1997/05/29 05:11:11 peter Exp $
  */
 
 #include "npx.h"
@@ -43,7 +43,7 @@
 #include <sys/rtprio.h>
 
 #include <machine/asmacros.h>
-#include <machine/spl.h>
+#include <machine/ipl.h>
 #include <machine/smpasm.h>
 #include <machine/smptests.h>		/** TEST_LOPRIO */
 
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index 23b3f14349a..054e086c60f 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -30,13 +30,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.27 1997/05/26 18:00:34 fsmp Exp $
+ *	$Id: exception.s,v 1.28 1997/05/29 05:11:09 peter Exp $
  */
 
 #include "npx.h"				/* NNPX */
 #include "assym.s"				/* system defines */
 #include <sys/errno.h>				/* error return codes */
-#include <machine/spl.h>			/* SWI_AST_MASK ... */
+#include <machine/ipl.h>			/* SWI_AST_MASK ... */
 #include <machine/psl.h>			/* PSL_I */
 #include <machine/trap.h>			/* trap codes */
 #include <sys/syscall.h>			/* syscall numbers */
diff --git a/sys/amd64/amd64/exception.s b/sys/amd64/amd64/exception.s
index 23b3f14349a..054e086c60f 100644
--- a/sys/amd64/amd64/exception.s
+++ b/sys/amd64/amd64/exception.s
@@ -30,13 +30,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.27 1997/05/26 18:00:34 fsmp Exp $
+ *	$Id: exception.s,v 1.28 1997/05/29 05:11:09 peter Exp $
  */
 
 #include "npx.h"				/* NNPX */
 #include "assym.s"				/* system defines */
 #include <sys/errno.h>				/* error return codes */
-#include <machine/spl.h>			/* SWI_AST_MASK ... */
+#include <machine/ipl.h>			/* SWI_AST_MASK ... */
 #include <machine/psl.h>			/* PSL_I */
 #include <machine/trap.h>			/* trap codes */
 #include <sys/syscall.h>			/* syscall numbers */
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index b4334995df7..d364f4fc100 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.42 1997/04/26 11:46:03 peter Exp $
+ *	$Id: npx.c,v 1.43 1997/05/07 19:58:13 peter Exp $
  */
 
 #include "npx.h"
@@ -56,8 +56,9 @@
 
 #include <machine/asmacros.h>
 #include <machine/cpu.h>
-#include <machine/pcb.h>
+#include <machine/ipl.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/trap.h>
 #include <machine/clock.h>
 #include <machine/specialreg.h>
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index 66d462687bc..094e75b2675 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.49 1997/04/28 08:39:48 fsmp Exp $
+ *	$Id: swtch.s,v 1.50 1997/05/29 05:11:11 peter Exp $
  */
 
 #include "npx.h"
@@ -43,7 +43,7 @@
 #include <sys/rtprio.h>
 
 #include <machine/asmacros.h>
-#include <machine/spl.h>
+#include <machine/ipl.h>
 #include <machine/smpasm.h>
 #include <machine/smptests.h>		/** TEST_LOPRIO */
 
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index da31b92f48f..d5087884088 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.95 1997/05/07 20:08:53 peter Exp $
+ *	$Id: trap.c,v 1.96 1997/05/29 05:04:30 peter Exp $
  */
 
 /*
@@ -71,6 +71,7 @@
 #include <sys/user.h>
 
 #include <machine/cpu.h>
+#include <machine/ipl.h>
 #include <machine/md_var.h>
 #include <machine/psl.h>
 #include <machine/reg.h>
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index c36fc8bda9e..13e66f5d77c 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.84 1997/05/25 16:55:25 fsmp Exp $
+ *	$Id: clock.c,v 1.85 1997/05/29 05:00:35 peter Exp $
  */
 
 /*
@@ -63,6 +63,7 @@
 #endif
 #include <machine/cpu.h>
 #include <machine/frame.h>
+#include <machine/ipl.h>
 
 #include <i386/isa/icu.h>
 #include <i386/isa/isa.h>
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index c36fc8bda9e..13e66f5d77c 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.84 1997/05/25 16:55:25 fsmp Exp $
+ *	$Id: clock.c,v 1.85 1997/05/29 05:00:35 peter Exp $
  */
 
 /*
@@ -63,6 +63,7 @@
 #endif
 #include <machine/cpu.h>
 #include <machine/frame.h>
+#include <machine/ipl.h>
 
 #include <i386/isa/icu.h>
 #include <i386/isa/isa.h>
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index 9feb0ba173b..a54f7bbea33 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.86 1997/05/29 04:55:39 peter Exp $
+ *	$Id: isa.c,v 1.87 1997/05/29 05:56:12 fsmp Exp $
  */
 
 /*
@@ -54,6 +54,7 @@
 #include <sys/buf.h>
 #include <sys/syslog.h>
 #include <sys/malloc.h>
+#include <machine/ipl.h>
 #include <machine/md_var.h>
 #include <machine/segments.h>
 #if defined(APIC_IO)
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index b4334995df7..d364f4fc100 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.42 1997/04/26 11:46:03 peter Exp $
+ *	$Id: npx.c,v 1.43 1997/05/07 19:58:13 peter Exp $
  */
 
 #include "npx.h"
@@ -56,8 +56,9 @@
 
 #include <machine/asmacros.h>
 #include <machine/cpu.h>
-#include <machine/pcb.h>
+#include <machine/ipl.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/trap.h>
 #include <machine/clock.h>
 #include <machine/specialreg.h>
diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s
index 23b3f14349a..054e086c60f 100644
--- a/sys/i386/i386/exception.s
+++ b/sys/i386/i386/exception.s
@@ -30,13 +30,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.27 1997/05/26 18:00:34 fsmp Exp $
+ *	$Id: exception.s,v 1.28 1997/05/29 05:11:09 peter Exp $
  */
 
 #include "npx.h"				/* NNPX */
 #include "assym.s"				/* system defines */
 #include <sys/errno.h>				/* error return codes */
-#include <machine/spl.h>			/* SWI_AST_MASK ... */
+#include <machine/ipl.h>			/* SWI_AST_MASK ... */
 #include <machine/psl.h>			/* PSL_I */
 #include <machine/trap.h>			/* trap codes */
 #include <sys/syscall.h>			/* syscall numbers */
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index 66d462687bc..094e75b2675 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.49 1997/04/28 08:39:48 fsmp Exp $
+ *	$Id: swtch.s,v 1.50 1997/05/29 05:11:11 peter Exp $
  */
 
 #include "npx.h"
@@ -43,7 +43,7 @@
 #include <sys/rtprio.h>
 
 #include <machine/asmacros.h>
-#include <machine/spl.h>
+#include <machine/ipl.h>
 #include <machine/smpasm.h>
 #include <machine/smptests.h>		/** TEST_LOPRIO */
 
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index da31b92f48f..d5087884088 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.95 1997/05/07 20:08:53 peter Exp $
+ *	$Id: trap.c,v 1.96 1997/05/29 05:04:30 peter Exp $
  */
 
 /*
@@ -71,6 +71,7 @@
 #include <sys/user.h>
 
 #include <machine/cpu.h>
+#include <machine/ipl.h>
 #include <machine/md_var.h>
 #include <machine/psl.h>
 #include <machine/reg.h>
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index c36fc8bda9e..13e66f5d77c 100644
--- a/sys/i386/i386/tsc.c
+++ b/sys/i386/i386/tsc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.84 1997/05/25 16:55:25 fsmp Exp $
+ *	$Id: clock.c,v 1.85 1997/05/29 05:00:35 peter Exp $
  */
 
 /*
@@ -63,6 +63,7 @@
 #endif
 #include <machine/cpu.h>
 #include <machine/frame.h>
+#include <machine/ipl.h>
 
 #include <i386/isa/icu.h>
 #include <i386/isa/isa.h>
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index c36fc8bda9e..13e66f5d77c 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.84 1997/05/25 16:55:25 fsmp Exp $
+ *	$Id: clock.c,v 1.85 1997/05/29 05:00:35 peter Exp $
  */
 
 /*
@@ -63,6 +63,7 @@
 #endif
 #include <machine/cpu.h>
 #include <machine/frame.h>
+#include <machine/ipl.h>
 
 #include <i386/isa/icu.h>
 #include <i386/isa/isa.h>
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 9feb0ba173b..a54f7bbea33 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.86 1997/05/29 04:55:39 peter Exp $
+ *	$Id: isa.c,v 1.87 1997/05/29 05:56:12 fsmp Exp $
  */
 
 /*
@@ -54,6 +54,7 @@
 #include <sys/buf.h>
 #include <sys/syslog.h>
 #include <sys/malloc.h>
+#include <machine/ipl.h>
 #include <machine/md_var.h>
 #include <machine/segments.h>
 #if defined(APIC_IO)
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index b4334995df7..d364f4fc100 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.42 1997/04/26 11:46:03 peter Exp $
+ *	$Id: npx.c,v 1.43 1997/05/07 19:58:13 peter Exp $
  */
 
 #include "npx.h"
@@ -56,8 +56,9 @@
 
 #include <machine/asmacros.h>
 #include <machine/cpu.h>
-#include <machine/pcb.h>
+#include <machine/ipl.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/trap.h>
 #include <machine/clock.h>
 #include <machine/specialreg.h>
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index c36fc8bda9e..13e66f5d77c 100644
--- a/sys/isa/atrtc.c
+++ b/sys/isa/atrtc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.84 1997/05/25 16:55:25 fsmp Exp $
+ *	$Id: clock.c,v 1.85 1997/05/29 05:00:35 peter Exp $
  */
 
 /*
@@ -63,6 +63,7 @@
 #endif
 #include <machine/cpu.h>
 #include <machine/frame.h>
+#include <machine/ipl.h>
 
 #include <i386/isa/icu.h>
 #include <i386/isa/isa.h>
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index da31b92f48f..d5087884088 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.95 1997/05/07 20:08:53 peter Exp $
+ *	$Id: trap.c,v 1.96 1997/05/29 05:04:30 peter Exp $
  */
 
 /*
@@ -71,6 +71,7 @@
 #include <sys/user.h>
 
 #include <machine/cpu.h>
+#include <machine/ipl.h>
 #include <machine/md_var.h>
 #include <machine/psl.h>
 #include <machine/reg.h>