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

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

14 files changed, 14 insertions, 14 deletions

diff --git a/kern/ast.c b/kern/ast.c
index 8c514b3c..ea5730dd 100644
--- a/kern/ast.c
+++ b/kern/ast.c
@@ -46,7 +46,7 @@
 #include <kern/processor.h>
 #include <device/net_io.h>
 
-#include <machine/machspl.h>	/* for splsched */
+#include <machine/spl.h>	/* for splsched */
 
 #if	MACH_FIXPRI
 #include <mach/policy.h>
diff --git a/kern/eventcount.c b/kern/eventcount.c
index 1cbc15a2..46b4b642 100644
--- a/kern/eventcount.c
+++ b/kern/eventcount.c
@@ -49,7 +49,7 @@
 #include <kern/sched_prim.h>
 #include <kern/thread.h>
 
-#include <machine/machspl.h>	/* For def'n of splsched() */
+#include <machine/spl.h>	/* For def'n of splsched() */
 
 #include <kern/eventcount.h>
 
diff --git a/kern/ipc_host.c b/kern/ipc_host.c
index 6b818623..4c6c5306 100644
--- a/kern/ipc_host.c
+++ b/kern/ipc_host.c
@@ -45,7 +45,7 @@
 #include <ipc/ipc_space.h>
 #include <mach/mach_traps.h>
 
-#include <machine/machspl.h>	/* for spl */
+#include <machine/spl.h>	/* for spl */
 
 
 
diff --git a/kern/ipc_sched.c b/kern/ipc_sched.c
index 4519c654..370573ed 100644
--- a/kern/ipc_sched.c
+++ b/kern/ipc_sched.c
@@ -35,7 +35,7 @@
 #include <kern/processor.h>
 #include <kern/thread_swap.h>
 #include <kern/ipc_sched.h>
-#include <machine/machspl.h>	/* for splsched/splx */
+#include <machine/spl.h>	/* for splsched/splx */
 #include <machine/pmap.h>
 
 
diff --git a/kern/mach_clock.c b/kern/mach_clock.c
index 864704c8..4b953650 100644
--- a/kern/mach_clock.c
+++ b/kern/mach_clock.c
@@ -57,7 +57,7 @@
 #include <kern/priority.h>
 #include <vm/vm_kern.h>
 #include <machine/mach_param.h>	/* HZ */
-#include <machine/machspl.h>
+#include <machine/spl.h>
 #include <machine/model_dep.h>
 
 #if MACH_PCSAMPLE
diff --git a/kern/machine.c b/kern/machine.c
index 1322b549..a395937c 100644
--- a/kern/machine.c
+++ b/kern/machine.c
@@ -53,7 +53,7 @@
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <kern/printf.h>
-#include <machine/machspl.h>	/* for splsched */
+#include <machine/spl.h>	/* for splsched */
 #include <machine/model_dep.h>
 #include <machine/pcb.h>
 #include <sys/reboot.h>
diff --git a/kern/priority.c b/kern/priority.c
index 7f28b3d7..03c46eb3 100644
--- a/kern/priority.c
+++ b/kern/priority.c
@@ -45,7 +45,7 @@
 #include <kern/priority.h>
 #include <kern/processor.h>
 #include <kern/timer.h>
-#include <machine/machspl.h>
+#include <machine/spl.h>
 
 
 
diff --git a/kern/sched_prim.c b/kern/sched_prim.c
index 47e578e6..4f719357 100644
--- a/kern/sched_prim.c
+++ b/kern/sched_prim.c
@@ -35,7 +35,7 @@
 #include <kern/printf.h>
 #include <mach/machine.h>
 #include <machine/locore.h>
-#include <machine/machspl.h>	/* For def'n of splsched() */
+#include <machine/spl.h>	/* For def'n of splsched() */
 #include <machine/model_dep.h>
 #include <kern/ast.h>
 #include <kern/counters.h>
diff --git a/kern/startup.c b/kern/startup.c
index e72cf6f4..61751d35 100644
--- a/kern/startup.c
+++ b/kern/startup.c
@@ -56,7 +56,7 @@
 #include <vm/vm_page.h>
 #include <vm/vm_init.h>
 #include <vm/vm_pageout.h>
-#include <machine/machspl.h>
+#include <machine/spl.h>
 #include <machine/pcb.h>
 #include <machine/pmap.h>
 #include <machine/model_dep.h>
diff --git a/kern/syscall_subr.c b/kern/syscall_subr.c
index 0030e027..e0057d94 100644
--- a/kern/syscall_subr.c
+++ b/kern/syscall_subr.c
@@ -42,7 +42,7 @@
 #include <kern/ipc_sched.h>
 #include <kern/task.h>
 #include <kern/thread.h>
-#include <machine/machspl.h>	/* for splsched */
+#include <machine/spl.h>	/* for splsched */
 
 #if	MACH_FIXPRI
 #include <mach/policy.h>
diff --git a/kern/task.c b/kern/task.c
index dfba04d4..a85cd227 100644
--- a/kern/task.c
+++ b/kern/task.c
@@ -55,7 +55,7 @@
 #include <kern/syscall_emulation.h>
 #include <kern/task_notify.user.h>
 #include <vm/vm_kern.h>		/* for kernel_map, ipc_kernel_map */
-#include <machine/machspl.h>	/* for splsched */
+#include <machine/spl.h>	/* for splsched */
 
 task_t	kernel_task = TASK_NULL;
 struct kmem_cache task_cache;
diff --git a/kern/thread.c b/kern/thread.c
index eb73590c..68cc667e 100644
--- a/kern/thread.c
+++ b/kern/thread.c
@@ -70,7 +70,7 @@
 #include <ipc/ipc_port.h>
 #include <ipc/mach_msg.h>
 #include <ipc/mach_port.server.h>
-#include <machine/machspl.h>		/* for splsched */
+#include <machine/spl.h>		/* for splsched */
 #include <machine/pcb.h>
 #include <machine/thread.h>		/* for MACHINE_STACK */
 
diff --git a/kern/thread_swap.c b/kern/thread_swap.c
index a5fc0523..bfb39239 100644
--- a/kern/thread_swap.c
+++ b/kern/thread_swap.c
@@ -55,7 +55,7 @@
 #include <kern/sched_prim.h>
 #include <kern/processor.h>
 #include <kern/thread_swap.h>
-#include <machine/machspl.h>		/* for splsched */
+#include <machine/spl.h>		/* for splsched */
 
 
 
diff --git a/kern/xpr.c b/kern/xpr.c
index 1b551eb1..76bae40d 100644
--- a/kern/xpr.c
+++ b/kern/xpr.c
@@ -33,7 +33,7 @@
 #include <kern/xpr.h>
 #include <kern/lock.h>
 #include "cpu_number.h"
-#include <machine/machspl.h>
+#include <machine/spl.h>
 #include <vm/vm_kern.h>