[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] remove machine/machspl.h as it duplicates machine/spl.h
|
From: |
Luca Dariz |
|
Subject: |
[PATCH 2/3] remove machine/machspl.h as it duplicates machine/spl.h |
|
Date: |
Sat, 9 Mar 2024 15:02:43 +0100 |
From: LD <luca@orpolo.org>
---
device/chario.c | 2 +-
device/ds_routines.c | 4 ++--
device/net_io.c | 4 ++--
i386/Makefrag_x86.am | 1 -
i386/i386/db_interface.c | 2 +-
i386/i386/db_trace.c | 2 +-
i386/i386/fpu.c | 2 +-
i386/i386/ipl.h | 2 +-
i386/i386/irq.c | 2 +-
i386/i386/machspl.h | 29 -----------------------------
i386/i386/pic.c | 2 +-
i386/i386/trap.c | 2 +-
i386/i386at/com.c | 2 +-
i386/i386at/kd.c | 2 +-
i386/i386at/kd.h | 2 +-
i386/i386at/kd_event.c | 2 +-
i386/i386at/model_dep.c | 2 +-
i386/i386at/rtc.c | 2 +-
kern/ast.c | 2 +-
kern/eventcount.c | 2 +-
kern/ipc_host.c | 2 +-
kern/ipc_sched.c | 2 +-
kern/mach_clock.c | 2 +-
kern/machine.c | 2 +-
kern/priority.c | 2 +-
kern/sched_prim.c | 2 +-
kern/startup.c | 2 +-
kern/syscall_subr.c | 2 +-
kern/task.c | 2 +-
kern/thread.c | 2 +-
kern/thread_swap.c | 2 +-
kern/xpr.c | 2 +-
linux/dev/arch/i386/kernel/irq.c | 2 +-
linux/dev/kernel/sched.c | 2 +-
xen/console.c | 2 +-
35 files changed, 35 insertions(+), 65 deletions(-)
delete mode 100644 i386/i386/machspl.h
diff --git a/device/chario.c b/device/chario.c
index 3fe93ccb..efb55867 100644
--- a/device/chario.c
+++ b/device/chario.c
@@ -34,7 +34,7 @@
#include <mach/kern_return.h>
#include <mach/mig_errors.h>
#include <mach/vm_param.h>
-#include <machine/machspl.h> /* spl definitions */
+#include <machine/spl.h> /* spl definitions */
#include <ipc/ipc_port.h>
diff --git a/device/ds_routines.c b/device/ds_routines.c
index d97d229e..439fc5b3 100644
--- a/device/ds_routines.c
+++ b/device/ds_routines.c
@@ -63,7 +63,7 @@
#include <mach/vm_param.h>
#include <mach/notify.h>
#include <machine/locore.h>
-#include <machine/machspl.h> /* spl definitions */
+#include <machine/spl.h> /* spl definitions */
#include <ipc/ipc_port.h>
#include <ipc/ipc_space.h>
@@ -95,7 +95,7 @@
#include <device/device_emul.h>
#include <device/intr.h>
-#include <machine/machspl.h>
+#include <machine/spl.h>
#ifdef LINUX_DEV
extern struct device_emulation_ops linux_block_emulation_ops;
diff --git a/device/net_io.c b/device/net_io.c
index ee9435d7..efde9d6c 100644
--- a/device/net_io.c
+++ b/device/net_io.c
@@ -42,7 +42,7 @@
#include <string.h>
#include <device/net_status.h>
-#include <machine/machspl.h> /* spl definitions */
+#include <machine/spl.h> /* spl definitions */
#include <device/net_io.h>
#include <device/if_hdr.h>
#include <device/io_req.h>
@@ -64,7 +64,7 @@
#include <kern/slab.h>
#include <kern/thread.h>
-#include <machine/machspl.h>
+#include <machine/spl.h>
#if MACH_TTD
#include <ttd/ttd_stub.h>
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>
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>
diff --git a/linux/dev/arch/i386/kernel/irq.c b/linux/dev/arch/i386/kernel/irq.c
index 3b349ccc..c91a5022 100644
--- a/linux/dev/arch/i386/kernel/irq.c
+++ b/linux/dev/arch/i386/kernel/irq.c
@@ -49,7 +49,7 @@
#include <asm/hardirq.h>
#include <linux/dev/glue/glue.h>
-#include <machine/machspl.h>
+#include <machine/spl.h>
#include <device/intr.h>
diff --git a/linux/dev/kernel/sched.c b/linux/dev/kernel/sched.c
index f87482ef..4634d96b 100644
--- a/linux/dev/kernel/sched.c
+++ b/linux/dev/kernel/sched.c
@@ -36,7 +36,7 @@
#include <kern/sched_prim.h>
#include <kern/printf.h>
-#include <machine/machspl.h>
+#include <machine/spl.h>
#define MACH_INCLUDE
#include <linux/sched.h>
diff --git a/xen/console.c b/xen/console.c
index 9ceb6ddf..704429a7 100644
--- a/xen/console.c
+++ b/xen/console.c
@@ -21,7 +21,7 @@
#include <device/tty.h>
#include <device/cons.h>
#include <machine/pmap.h>
-#include <machine/machspl.h>
+#include <machine/spl.h>
#include <xen/public/io/console.h>
#include "console.h"
#include "ring.h"
--
2.39.2