remove machine/machspl.h as it duplicates machine/spl.h

Message-ID: <20240309140244.347835-2-luca@orpolo.org>

15 files changed, 13 insertions, 43 deletions

diff --git a/i386/Makefrag_x86.am b/i386/Makefrag_x86.am
index 272de023..a6c7a5c8 100644
--- a/i386/Makefrag_x86.am
+++ b/i386/Makefrag_x86.am
@@ -50,7 +50,6 @@ libkernel_a_SOURCES += \
 	i386/i386/mach_param.h \
 	i386/i386/machine_routines.h \
 	i386/i386/machine_task.c \
-	i386/i386/machspl.h \
 	i386/i386/model_dep.h \
 	i386/i386/mp_desc.c \
 	i386/i386/mp_desc.h \
diff --git a/i386/i386/db_interface.c b/i386/i386/db_interface.c
index 483991d6..392e2b69 100644
--- a/i386/i386/db_interface.c
+++ b/i386/i386/db_interface.c
@@ -59,7 +59,7 @@
 #include <ddb/db_watch.h>
 #include <ddb/db_mp.h>
 #include <machine/db_interface.h>
-#include <machine/machspl.h>
+#include <machine/spl.h>
 
 #if MACH_KDB
 /* Whether the kernel uses any debugging register.  */
diff --git a/i386/i386/db_trace.c b/i386/i386/db_trace.c
index 0ef72518..abc32554 100644
--- a/i386/i386/db_trace.c
+++ b/i386/i386/db_trace.c
@@ -34,7 +34,7 @@
 #include <kern/task.h>
 
 #include <machine/db_machdep.h>
-#include <machine/machspl.h>
+#include <machine/spl.h>
 #include <machine/db_interface.h>
 #include <machine/db_trace.h>
 #include <machine/cpu_number.h>
diff --git a/i386/i386/fpu.c b/i386/i386/fpu.c
index 4cd31dd9..316e3b41 100644
--- a/i386/i386/fpu.c
+++ b/i386/i386/fpu.c
@@ -43,7 +43,7 @@
 #include <mach/machine/fp_reg.h>
 
 #include <kern/debug.h>
-#include <machine/machspl.h>	/* spls */
+#include <machine/spl.h>	/* spls */
 #include <kern/printf.h>
 #include <kern/thread.h>
 #include <kern/slab.h>
diff --git a/i386/i386/ipl.h b/i386/i386/ipl.h
index 6e59b368..2d02e3c2 100644
--- a/i386/i386/ipl.h
+++ b/i386/i386/ipl.h
@@ -71,7 +71,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef	KERNEL
 #ifndef	__ASSEMBLER__
-#include <machine/machspl.h>
+#include <machine/spl.h>
 /* Note that interrupts have varying signatures */
 typedef void (*interrupt_handler_fn)(int);
 extern interrupt_handler_fn ivect[];
diff --git a/i386/i386/irq.c b/i386/i386/irq.c
index a7c98890..3c2f1748 100644
--- a/i386/i386/irq.c
+++ b/i386/i386/irq.c
@@ -22,7 +22,7 @@
 #include <mach/kern_return.h>
 #include <kern/queue.h>
 #include <kern/assert.h>
-#include <machine/machspl.h>
+#include <machine/spl.h>
 
 extern queue_head_t main_intr_queue;
 
diff --git a/i386/i386/machspl.h b/i386/i386/machspl.h
deleted file mode 100644
index bbb26754..00000000
--- a/i386/i386/machspl.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-/* XXX replaced by... */
-#include <i386/spl.h>
-
diff --git a/i386/i386/pic.c b/i386/i386/pic.c
index 66fbc04a..0218fea4 100644
--- a/i386/i386/pic.c
+++ b/i386/i386/pic.c
@@ -71,7 +71,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kern/printf.h>
 #include <i386/ipl.h>
 #include <i386/pic.h>
-#include <i386/machspl.h>
+#include <i386/spl.h>
 #include <i386/pio.h>
 
 spl_t	curr_ipl[NCPUS] = {0};
diff --git a/i386/i386/trap.c b/i386/i386/trap.c
index 842a0e04..555d7498 100644
--- a/i386/i386/trap.c
+++ b/i386/i386/trap.c
@@ -36,7 +36,7 @@
 #include <i386/locore.h>
 #include <i386/model_dep.h>
 #include <intel/read_fault.h>
-#include <machine/machspl.h>	/* for spl_t */
+#include <machine/spl.h>	/* for spl_t */
 #include <machine/db_interface.h>
 
 #include <mach/exception.h>
diff --git a/i386/i386at/com.c b/i386/i386at/com.c
index bfe353ce..ed2d4d1a 100644
--- a/i386/i386at/com.c
+++ b/i386/i386at/com.c
@@ -40,7 +40,7 @@
 
 #include <i386/ipl.h>
 #include <i386/pio.h>
-#include <i386/machspl.h>
+#include <i386/spl.h>
 #include <chips/busses.h>
 #include <i386at/autoconf.h>
 #include <i386at/com.h>
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index 2bea3c8c..237c3bc6 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -89,7 +89,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <i386/locore.h>
 #include <i386/loose_ends.h>
 #include <i386/vm_param.h>
-#include <i386/machspl.h>
+#include <i386/spl.h>
 #include <i386/pio.h>
 #include <i386at/cram.h>
 #include <i386at/kd.h>
diff --git a/i386/i386at/kd.h b/i386/i386at/kd.h
index 5bfabce2..24e27191 100644
--- a/i386/i386at/kd.h
+++ b/i386/i386at/kd.h
@@ -568,7 +568,7 @@ extern u_char	key_map[NUMKEYS][WIDTH_KMAP];
  */
 
 #ifdef	KERNEL
-#include <i386/machspl.h>
+#include <i386/spl.h>
 #define SPLKD	spltty
 #endif /* KERNEL */
 
diff --git a/i386/i386at/kd_event.c b/i386/i386at/kd_event.c
index 247d95b1..429d430c 100644
--- a/i386/i386at/kd_event.c
+++ b/i386/i386at/kd_event.c
@@ -62,7 +62,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <device/ds_routines.h>
 #include <device/device_types.h>
 #include <device/io_req.h>
-#include <i386/machspl.h>
+#include <i386/spl.h>
 #include <i386/pio.h>
 #include <i386at/kd.h>
 #include <i386at/kd_queue.h>
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index edb5b48b..a3e9b630 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -57,7 +57,7 @@
 #include <i386/gdt.h>
 #include <i386/ktss.h>
 #include <i386/ldt.h>
-#include <i386/machspl.h>
+#include <i386/spl.h>
 #include <i386/mp_desc.h>
 #include <i386/pit.h>
 #include <i386/pmap.h>
diff --git a/i386/i386at/rtc.c b/i386/i386at/rtc.c
index 1930beb0..224f14dc 100644
--- a/i386/i386at/rtc.c
+++ b/i386/i386at/rtc.c
@@ -49,7 +49,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <sys/types.h>
 #include <kern/mach_clock.h>
 #include <kern/printf.h>
-#include <i386/machspl.h>
+#include <i386/spl.h>
 #include <i386/pio.h>
 #include <i386at/rtc.h>