summaryrefslogtreecommitdiff
path: root/kern
diff options
context:
space:
mode:
Diffstat (limited to 'kern')
-rw-r--r--kern/ast.c3
-rw-r--r--kern/ast.h2
-rw-r--r--kern/bootstrap.c2
-rw-r--r--kern/counters.c2
-rw-r--r--kern/counters.h2
-rw-r--r--kern/cpu_number.h2
-rw-r--r--kern/debug.c3
-rw-r--r--kern/eventcount.c3
-rw-r--r--kern/exception.c2
-rw-r--r--kern/host.c3
-rw-r--r--kern/ipc_kobject.c4
-rw-r--r--kern/ipc_sched.c3
-rw-r--r--kern/ipc_tt.c2
-rw-r--r--kern/lock.c3
-rw-r--r--kern/lock.h3
-rw-r--r--kern/lock_mon.c5
-rw-r--r--kern/mach4.srv2
-rw-r--r--kern/mach_clock.c3
-rw-r--r--kern/mach_factor.c2
-rw-r--r--kern/machine.c3
-rw-r--r--kern/pc_sample.c4
-rw-r--r--kern/priority.c2
-rw-r--r--kern/processor.c4
-rw-r--r--kern/processor.h4
-rw-r--r--kern/sched.h5
-rw-r--r--kern/sched_prim.c8
-rw-r--r--kern/startup.c5
-rw-r--r--kern/syscall_subr.c3
-rw-r--r--kern/syscall_sw.c2
-rw-r--r--kern/task.c4
-rw-r--r--kern/task.h2
-rw-r--r--kern/thread.c8
-rw-r--r--kern/thread.h5
-rw-r--r--kern/timer.c3
-rw-r--r--kern/timer.h3
-rw-r--r--kern/xpr.c1
-rw-r--r--kern/xpr.h4
-rw-r--r--kern/zalloc.c1
38 files changed, 1 insertions, 121 deletions
diff --git a/kern/ast.c b/kern/ast.c
index 9498ce7..8fff997 100644
--- a/kern/ast.c
+++ b/kern/ast.c
@@ -35,9 +35,6 @@
*
*/
-#include <cpus.h>
-#include <mach_fixpri.h>
-
#include <kern/ast.h>
#include <kern/counters.h>
#include "cpu_number.h"
diff --git a/kern/ast.h b/kern/ast.h
index 14a5535..ba22af8 100644
--- a/kern/ast.h
+++ b/kern/ast.h
@@ -40,8 +40,6 @@
* a set of reasons for an AST, and passing this set to ast_taken.
*/
-#include <cpus.h>
-
#include "cpu_number.h"
#include <kern/macro_help.h>
#include <machine/ast.h>
diff --git a/kern/bootstrap.c b/kern/bootstrap.c
index 543ae77..19e25ea 100644
--- a/kern/bootstrap.c
+++ b/kern/bootstrap.c
@@ -29,8 +29,6 @@
/*
* Bootstrap the various built-in servers.
*/
-#include <mach_kdb.h>
-#include <bootstrap_symbols.h>
#include <mach/port.h>
#include <mach/message.h>
diff --git a/kern/counters.c b/kern/counters.c
index d10aa81..a9d450e 100644
--- a/kern/counters.c
+++ b/kern/counters.c
@@ -24,8 +24,6 @@
* the rights to redistribute these changes.
*/
-#include <mach_counters.h>
-
#include <kern/counters.h>
/*
diff --git a/kern/counters.h b/kern/counters.h
index be5d8bb..474c6a2 100644
--- a/kern/counters.h
+++ b/kern/counters.h
@@ -27,8 +27,6 @@
#ifndef _KERN_COUNTERS_
#define _KERN_COUNTERS_
-#include <mach_counters.h>
-
/*
* We can count various interesting events and paths.
*
diff --git a/kern/cpu_number.h b/kern/cpu_number.h
index 32d8323..44bbd64 100644
--- a/kern/cpu_number.h
+++ b/kern/cpu_number.h
@@ -27,8 +27,6 @@
#ifndef _KERN_CPU_NUMBER_H_
#define _KERN_CPU_NUMBER_H_
-#include <cpus.h>
-
/*
* Definitions for cpu identification in multi-processors.
*/
diff --git a/kern/debug.c b/kern/debug.c
index 3827e8f..6a31ab8 100644
--- a/kern/debug.c
+++ b/kern/debug.c
@@ -26,9 +26,6 @@
#include <stdarg.h>
-#include <mach_kdb.h>
-#include <cpus.h>
-
#include "cpu_number.h"
#include <kern/lock.h>
#include <kern/thread.h>
diff --git a/kern/eventcount.c b/kern/eventcount.c
index 9121386..1418c82 100644
--- a/kern/eventcount.c
+++ b/kern/eventcount.c
@@ -35,9 +35,6 @@
*
*/
-
-#include <cpus.h>
-
#include <mach/machine.h>
#include <kern/ast.h>
#include "cpu_number.h"
diff --git a/kern/exception.c b/kern/exception.c
index e8b9c0e..62292b4 100644
--- a/kern/exception.c
+++ b/kern/exception.c
@@ -24,8 +24,6 @@
* the rights to redistribute these changes.
*/
-#include <mach_kdb.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/message.h>
diff --git a/kern/host.c b/kern/host.c
index 062f923..a757266 100644
--- a/kern/host.c
+++ b/kern/host.c
@@ -29,9 +29,6 @@
* Non-ipc host functions.
*/
-#include <cpus.h>
-#include <mach_host.h>
-
#include <kern/assert.h>
#include <kern/kalloc.h>
#include <kern/host.h>
diff --git a/kern/ipc_kobject.c b/kern/ipc_kobject.c
index 60db89c..7e51d92 100644
--- a/kern/ipc_kobject.c
+++ b/kern/ipc_kobject.c
@@ -33,10 +33,6 @@
* Functions for letting a port represent a kernel object.
*/
-#include <mach_debug.h>
-#include <mach_ipc_test.h>
-#include <mach_machine_routines.h>
-
#include <mach/port.h>
#include <mach/kern_return.h>
#include <mach/message.h>
diff --git a/kern/ipc_sched.c b/kern/ipc_sched.c
index a2f4c35..e1edfd6 100644
--- a/kern/ipc_sched.c
+++ b/kern/ipc_sched.c
@@ -24,9 +24,6 @@
* the rights to redistribute these changes.
*/
-#include <cpus.h>
-#include <mach_host.h>
-
#include <mach/message.h>
#include <kern/counters.h>
#include "cpu_number.h"
diff --git a/kern/ipc_tt.c b/kern/ipc_tt.c
index 816124f..b1a9443 100644
--- a/kern/ipc_tt.c
+++ b/kern/ipc_tt.c
@@ -29,8 +29,6 @@
* Task and thread related IPC functions.
*/
-#include <mach_ipc_compat.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/mach_param.h>
diff --git a/kern/lock.c b/kern/lock.c
index 4d88153..15bc988 100644
--- a/kern/lock.c
+++ b/kern/lock.c
@@ -34,9 +34,6 @@
* Locking primitives implementation
*/
-#include <cpus.h>
-#include <mach_kdb.h>
-
#include <kern/lock.h>
#include <kern/thread.h>
#include <kern/sched_prim.h>
diff --git a/kern/lock.h b/kern/lock.h
index 9be63c5..a8f2fd1 100644
--- a/kern/lock.h
+++ b/kern/lock.h
@@ -34,9 +34,6 @@
#ifndef _KERN_LOCK_H_
#define _KERN_LOCK_H_
-#include <cpus.h>
-#include <mach_ldebug.h>
-
#include <mach/boolean.h>
#include <mach/machine/vm_types.h>
diff --git a/kern/lock_mon.c b/kern/lock_mon.c
index 143d914..1d92ebf 100644
--- a/kern/lock_mon.c
+++ b/kern/lock_mon.c
@@ -38,11 +38,6 @@
* Depending on hardware also records time spent with locks held
*/
-#include <cpus.h>
-#include <mach_mp_debug.h>
-#include <mach_lock_mon.h>
-#include <time_stamp.h>
-
#include <sys/types.h>
#include <mach/machine/vm_types.h>
#include <mach/boolean.h>
diff --git a/kern/mach4.srv b/kern/mach4.srv
index 9df7cea..ead5484 100644
--- a/kern/mach4.srv
+++ b/kern/mach4.srv
@@ -21,8 +21,6 @@
*/
/* This is a server presentation file. */
-#include <mach_pcsample.h>
-
#define KERNEL_SERVER 1
#ifdef MIGRATING_THREADS
diff --git a/kern/mach_clock.c b/kern/mach_clock.c
index bfa6620..71cd583 100644
--- a/kern/mach_clock.c
+++ b/kern/mach_clock.c
@@ -33,9 +33,6 @@
*
* Clock primitives.
*/
-#include <cpus.h>
-#include <mach_pcsample.h>
-#include <stat_time.h>
#include <mach/boolean.h>
#include <mach/machine.h>
diff --git a/kern/mach_factor.c b/kern/mach_factor.c
index 34a7d0c..d9e0465 100644
--- a/kern/mach_factor.c
+++ b/kern/mach_factor.c
@@ -31,8 +31,6 @@
* Compute the Mach Factor.
*/
-#include <cpus.h>
-
#include <mach/machine.h>
#include <mach/processor_info.h>
#include <kern/sched.h>
diff --git a/kern/machine.c b/kern/machine.c
index 5dba1ae..e242da8 100644
--- a/kern/machine.c
+++ b/kern/machine.c
@@ -34,9 +34,6 @@
* Support for machine independent machine abstraction.
*/
-#include <cpus.h>
-#include <mach_host.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/mach_types.h>
diff --git a/kern/pc_sample.c b/kern/pc_sample.c
index 01b9acb..87c7a6c 100644
--- a/kern/pc_sample.c
+++ b/kern/pc_sample.c
@@ -24,10 +24,6 @@
* the rights to redistribute these changes.
*/
-
-
-#include <mach_pcsample.h>
-
#include <mach/mach_types.h> /* vm_address_t */
#include <mach/std_types.h> /* pointer_t */
#include <mach/pc_sample.h>
diff --git a/kern/priority.c b/kern/priority.c
index f9a4091..8e3f2e5 100644
--- a/kern/priority.c
+++ b/kern/priority.c
@@ -34,8 +34,6 @@
* Clock primitives.
*/
-#include <cpus.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/machine.h>
diff --git a/kern/processor.c b/kern/processor.c
index 6066ecf..a6e65c8 100644
--- a/kern/processor.c
+++ b/kern/processor.c
@@ -27,10 +27,6 @@
* processor.c: processor and processor_set manipulation routines.
*/
-#include <cpus.h>
-#include <mach_fixpri.h>
-#include <mach_host.h>
-
#include <mach/boolean.h>
#include <mach/policy.h>
#include <mach/processor_info.h>
diff --git a/kern/processor.h b/kern/processor.h
index 8de7a68..7ff7124 100644
--- a/kern/processor.h
+++ b/kern/processor.h
@@ -37,10 +37,6 @@
* Data structures for managing processors and sets of processors.
*/
-#include <cpus.h>
-#include <mach_fixpri.h>
-#include <mach_host.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/port.h>
diff --git a/kern/sched.h b/kern/sched.h
index 6616e0f..c4ff647 100644
--- a/kern/sched.h
+++ b/kern/sched.h
@@ -35,11 +35,6 @@
#ifndef _KERN_SCHED_H_
#define _KERN_SCHED_H_
-#include <cpus.h>
-#include <mach_fixpri.h>
-#include <simple_clock.h>
-#include <stat_time.h>
-
#include <kern/queue.h>
#include <kern/lock.h>
#include <kern/macro_help.h>
diff --git a/kern/sched_prim.c b/kern/sched_prim.c
index b3c60ad..24b64f9 100644
--- a/kern/sched_prim.c
+++ b/kern/sched_prim.c
@@ -32,14 +32,6 @@
*
*/
-#include <cpus.h>
-#include <simple_clock.h>
-#include <mach_fixpri.h>
-#include <mach_host.h>
-#include <hw_footprint.h>
-#include <fast_tas.h>
-#include <power_save.h>
-
#include <mach/machine.h>
#include <kern/ast.h>
#include <kern/counters.h>
diff --git a/kern/startup.c b/kern/startup.c
index 86d109a..f8d444f 100644
--- a/kern/startup.c
+++ b/kern/startup.c
@@ -27,11 +27,6 @@
* Mach kernel startup.
*/
-
-#include <xpr_debug.h>
-#include <cpus.h>
-#include <mach_host.h>
-
#include <mach/boolean.h>
#include <mach/machine.h>
#include <mach/task_special_ports.h>
diff --git a/kern/syscall_subr.c b/kern/syscall_subr.c
index 8c5b38a..a94e8db 100644
--- a/kern/syscall_subr.c
+++ b/kern/syscall_subr.c
@@ -27,9 +27,6 @@
* the rights to redistribute these changes.
*/
-#include <mach_fixpri.h>
-#include <cpus.h>
-
#include <mach/boolean.h>
#include <mach/thread_switch.h>
#include <ipc/ipc_port.h>
diff --git a/kern/syscall_sw.c b/kern/syscall_sw.c
index 64a5d0d..d4c3e07 100644
--- a/kern/syscall_sw.c
+++ b/kern/syscall_sw.c
@@ -27,8 +27,6 @@
* the rights to redistribute these changes.
*/
-#include <mach_ipc_compat.h>
-
#include <mach/port.h>
#include <mach/kern_return.h>
#include <kern/syscall_sw.h>
diff --git a/kern/task.c b/kern/task.c
index d7e6082..c7633c1 100644
--- a/kern/task.c
+++ b/kern/task.c
@@ -31,10 +31,6 @@
* Task management primitives implementation.
*/
-#include <mach_host.h>
-#include <mach_pcsample.h>
-#include <fast_tas.h>
-
#include <mach/machine/vm_types.h>
#include <mach/vm_param.h>
#include <mach/task_info.h>
diff --git a/kern/task.h b/kern/task.h
index a3f4302..e467a2f 100644
--- a/kern/task.h
+++ b/kern/task.h
@@ -34,8 +34,6 @@
#ifndef _KERN_TASK_H_
#define _KERN_TASK_H_
-#include <fast_tas.h>
-
#include <mach/boolean.h>
#include <mach/port.h>
#include <mach/time_value.h>
diff --git a/kern/thread.c b/kern/thread.c
index f1dcc52..333ee9a 100644
--- a/kern/thread.c
+++ b/kern/thread.c
@@ -31,14 +31,6 @@
* Thread management primitives implementation.
*/
-#include <cpus.h>
-#include <hw_footprint.h>
-#include <mach_host.h>
-#include <mach_fixpri.h>
-#include <mach_pcsample.h>
-#include <simple_clock.h>
-#include <mach_debug.h>
-
#include <mach/std_types.h>
#include <mach/policy.h>
#include <mach/thread_info.h>
diff --git a/kern/thread.h b/kern/thread.h
index b6c801f..e8008d5 100644
--- a/kern/thread.h
+++ b/kern/thread.h
@@ -34,11 +34,6 @@
#ifndef _KERN_THREAD_H_
#define _KERN_THREAD_H_
-#include <mach_ipc_compat.h>
-#include <hw_footprint.h>
-#include <mach_fixpri.h>
-#include <mach_host.h>
-
#include <mach/boolean.h>
#include <mach/thread_info.h>
#include <mach/thread_status.h>
diff --git a/kern/timer.c b/kern/timer.c
index 326d340..ec0524a 100644
--- a/kern/timer.c
+++ b/kern/timer.c
@@ -24,9 +24,6 @@
* the rights to redistribute these changes.
*/
-#include <cpus.h>
-#include <stat_time.h>
-
#include <mach/kern_return.h>
#include <mach/port.h>
#include <kern/queue.h>
diff --git a/kern/timer.h b/kern/timer.h
index 4573936..4146237 100644
--- a/kern/timer.h
+++ b/kern/timer.h
@@ -27,9 +27,6 @@
#ifndef _KERN_TIMER_H_
#define _KERN_TIMER_H_
-#include <cpus.h>
-#include <stat_time.h>
-
#include <kern/macro_help.h>
#if STAT_TIME
diff --git a/kern/xpr.c b/kern/xpr.c
index 872ab8d..e3e5377 100644
--- a/kern/xpr.c
+++ b/kern/xpr.c
@@ -24,7 +24,6 @@
* the rights to redistribute these changes.
*/
-#include <mach_kdb.h>
/*
* xpr silent tracing circular buffer.
*/
diff --git a/kern/xpr.h b/kern/xpr.h
index 29a6005..1e1204d 100644
--- a/kern/xpr.h
+++ b/kern/xpr.h
@@ -48,9 +48,7 @@
#ifndef _KERN_XPR_H_
#define _KERN_XPR_H_
-#ifdef KERNEL
-#include <xpr_debug.h>
-#else /* KERNEL */
+#ifndef KERNEL
#include <sys/features.h>
#endif /* KERNEL */
diff --git a/kern/zalloc.c b/kern/zalloc.c
index 0e62b01..18239be 100644
--- a/kern/zalloc.c
+++ b/kern/zalloc.c
@@ -42,7 +42,6 @@
#include <vm/vm_kern.h>
#include <machine/machspl.h>
-#include <mach_debug.h>
#if MACH_DEBUG
#include <mach/kern_return.h>
#include <mach/machine/vm_types.h>