2007-02-05 Thomas Schwinge <tschwinge@gnu.org>

* i386/i386/hardclock.c: Include <kern/mach_clock.h> instead of
	<kern/time_out.h>.
	* i386/i386/pit.c: Likewise.
	* i386/i386at/kd.c: Likewise.
	* i386/i386at/model_dep.c: Likewise.
	* i386/i386at/rtc.c: Likewise.
	* kern/ipc_sched.c: Likewise.
	* kern/mach_factor.c: Likewise.
	* kern/priority.c: Likewise.
	* kern/sched_prim.c: Likewise.
	* kern/startup.c: Likewise.
	* kern/syscall_subr.c: Likewise.
	* kern/thread.h: Likewise.
	* kern/zalloc.c: Likewise.

	* kern/host.c: Include <kern/mach_clock.h>.
	(tick): Remove declaration.
	* kern/pc_sample.c: Likewise.
	* kern/thread.c: Likewise.
	* kern/sched_prim.c (hz): Remove declaration.
	* kern/syscall_subr.c (hz): Likewise.
	* linux/dev/init/main.c (hz): Likewise.

18 files changed, 39 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index ab4167d..b2f3eee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 2007-02-05  Thomas Schwinge  <tschwinge@gnu.org>
 
+	* i386/i386/hardclock.c: Include <kern/mach_clock.h> instead of
+	<kern/time_out.h>.
+	* i386/i386/pit.c: Likewise.
+	* i386/i386at/kd.c: Likewise.
+	* i386/i386at/model_dep.c: Likewise.
+	* i386/i386at/rtc.c: Likewise.
+	* kern/ipc_sched.c: Likewise.
+	* kern/mach_factor.c: Likewise.
+	* kern/priority.c: Likewise.
+	* kern/sched_prim.c: Likewise.
+	* kern/startup.c: Likewise.
+	* kern/syscall_subr.c: Likewise.
+	* kern/thread.h: Likewise.
+	* kern/zalloc.c: Likewise.
+
+	* kern/host.c: Include <kern/mach_clock.h>.
+	(tick): Remove declaration.
+	* kern/pc_sample.c: Likewise.
+	* kern/thread.c: Likewise.
+	* kern/sched_prim.c (hz): Remove declaration.
+	* kern/syscall_subr.c (hz): Likewise.
+	* linux/dev/init/main.c (hz): Likewise.
+
 	* kern/time_out.h: Remove file after having installed the missing bits
 	in...
 	* kern/mach_clock.h: ... here.
diff --git a/i386/i386/hardclock.c b/i386/i386/hardclock.c
index 9e47df6..a8846b9 100644
--- a/i386/i386/hardclock.c
+++ b/i386/i386/hardclock.c
@@ -32,7 +32,7 @@
  */
 #include <mach/machine/eflags.h>
 
-#include <kern/time_out.h>
+#include <kern/mach_clock.h>
 #include <i386/thread.h>
 
 #if	defined(AT386)
diff --git a/i386/i386/pit.c b/i386/i386/pit.c
index 67332e3..8dc1233 100644
--- a/i386/i386/pit.c
+++ b/i386/i386/pit.c
@@ -49,7 +49,7 @@ NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <kern/time_out.h>
+#include <kern/mach_clock.h>
 #include <i386/ipl.h>
 #include <i386/pit.h>
 #include <i386/pio.h>
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index a388762..10e1d4e 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -78,8 +78,8 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <sys/types.h>
 #include <kern/debug.h>
+#include <kern/mach_clock.h>
 #include <kern/printf.h>
-#include <kern/time_out.h>
 #include <device/conf.h>
 #include <device/tty.h>
 #include <device/io_req.h>
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index 9d6b030..f183d19 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -40,10 +40,10 @@
 #include <mach/machine/multiboot.h>
 
 #include <i386/vm_param.h>
-#include <kern/time_out.h>
 #include <kern/assert.h>
 #include <kern/cpu_number.h>
 #include <kern/debug.h>
+#include <kern/mach_clock.h>
 #include <kern/printf.h>
 #include <sys/time.h>
 #include <vm/vm_page.h>
diff --git a/i386/i386at/rtc.c b/i386/i386at/rtc.c
index 0f4514c..a66c5a8 100644
--- a/i386/i386at/rtc.c
+++ b/i386/i386at/rtc.c
@@ -48,7 +48,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <sys/types.h>
 #include <sys/time.h>
-#include <kern/time_out.h>
+#include <kern/mach_clock.h>
 #include <i386/machspl.h>
 #include <i386/pio.h>
 #include <i386at/rtc.h>
diff --git a/kern/host.c b/kern/host.c
index acca8ae..57a40b4 100644
--- a/kern/host.c
+++ b/kern/host.c
@@ -41,11 +41,9 @@
 #include <mach/port.h>
 #include <kern/processor.h>
 #include <kern/ipc_host.h>
-
+#include <kern/mach_clock.h>
 #include <mach/vm_param.h>
 
-
-
 host_data_t	realhost;
 
 kern_return_t host_processors(
@@ -155,7 +153,6 @@ kern_return_t	host_info(
 	case HOST_SCHED_INFO:
 	    {
 		register host_sched_info_t	sched_info;
-		extern int	tick;	/* microseconds per clock tick */
 		extern int	min_quantum;
 					/* minimum quantum, in microseconds */
 
diff --git a/kern/ipc_sched.c b/kern/ipc_sched.c
index 60f1283..615ad60 100644
--- a/kern/ipc_sched.c
+++ b/kern/ipc_sched.c
@@ -29,10 +29,10 @@
 #include "cpu_number.h"
 #include <kern/debug.h>
 #include <kern/lock.h>
+#include <kern/mach_clock.h>
 #include <kern/thread.h>
 #include <kern/sched_prim.h>
 #include <kern/processor.h>
-#include <kern/time_out.h>
 #include <kern/thread_swap.h>
 #include <kern/ipc_sched.h>
 #include <machine/machspl.h>	/* for splsched/splx */
diff --git a/kern/mach_factor.c b/kern/mach_factor.c
index 16ca1f4..89e1851 100644
--- a/kern/mach_factor.c
+++ b/kern/mach_factor.c
@@ -33,9 +33,9 @@
 
 #include <mach/machine.h>
 #include <mach/processor_info.h>
+#include <kern/mach_clock.h>
 #include <kern/sched.h>
 #include <kern/processor.h>
-#include <kern/time_out.h>
 #if	MACH_KERNEL
 #include <mach/kern_return.h>
 #include <mach/port.h>
diff --git a/kern/pc_sample.c b/kern/pc_sample.c
index e26fd41..be28ca0 100644
--- a/kern/pc_sample.c
+++ b/kern/pc_sample.c
@@ -33,6 +33,7 @@
 #include <kern/host.h>
 #include <kern/thread.h>
 #include <kern/pc_sample.h>
+#include <kern/mach_clock.h>
 
 #if	MACH_PCSAMPLE
 
@@ -66,7 +67,6 @@ thread_enable_pc_sampling(
     sampled_pc_flavor_t flavors)
 {
     vm_offset_t buf;
-    extern int tick;
 
     if (thread == THREAD_NULL)  {
 	return KERN_INVALID_ARGUMENT;
@@ -92,7 +92,6 @@ task_enable_pc_sampling(
     sampled_pc_flavor_t flavors)
 {
     vm_offset_t buf;
-    extern int tick;
 
     if (task == TASK_NULL)  {
 	return KERN_INVALID_ARGUMENT;
diff --git a/kern/priority.c b/kern/priority.c
index 8e3f2e5..43d6101 100644
--- a/kern/priority.c
+++ b/kern/priority.c
@@ -38,12 +38,12 @@
 #include <mach/kern_return.h>
 #include <mach/machine.h>
 #include <kern/host.h>
+#include <kern/mach_clock.h>
 #include <kern/mach_param.h>
 #include <kern/sched.h>
 #include <kern/thread.h>
 #include <kern/processor.h>
 #include <kern/timer.h>
-#include <kern/time_out.h>
 #include <kern/time_stamp.h>
 #include <machine/machspl.h>
 
diff --git a/kern/sched_prim.c b/kern/sched_prim.c
index 69888e8..2596fa1 100644
--- a/kern/sched_prim.c
+++ b/kern/sched_prim.c
@@ -39,6 +39,7 @@
 #include <kern/cpu_number.h>
 #include <kern/debug.h>
 #include <kern/lock.h>
+#include <kern/mach_clock.h>
 #include <kern/mach_factor.h>
 #include <kern/macro_help.h>
 #include <kern/processor.h>
@@ -48,7 +49,6 @@
 #include <kern/syscall_subr.h>
 #include <kern/thread.h>
 #include <kern/thread_swap.h>
-#include <kern/time_out.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_map.h>
@@ -58,9 +58,6 @@
 #include <mach/policy.h>
 #endif	/* MACH_FIXPRI */
 
-
-extern int hz;
-
 int		min_quantum;	/* defines max context switch rate */
 
 unsigned	sched_tick;
diff --git a/kern/startup.c b/kern/startup.c
index 1dce8b4..e09cfdb 100644
--- a/kern/startup.c
+++ b/kern/startup.c
@@ -34,13 +34,13 @@
 #include <ipc/ipc_init.h>
 #include <kern/cpu_number.h>
 #include <kern/debug.h>
+#include <kern/mach_clock.h>
 #include <kern/printf.h>
 #include <kern/processor.h>
 #include <kern/sched_prim.h>
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <kern/thread_swap.h>
-#include <kern/time_out.h>
 #include <kern/timer.h>
 #include <kern/zalloc.h>
 #include <vm/vm_kern.h>
diff --git a/kern/syscall_subr.c b/kern/syscall_subr.c
index 01bd932..28119f1 100644
--- a/kern/syscall_subr.c
+++ b/kern/syscall_subr.c
@@ -33,13 +33,13 @@
 #include <ipc/ipc_space.h>
 #include <kern/counters.h>
 #include <kern/ipc_kobject.h>
+#include <kern/mach_clock.h>
 #include <kern/processor.h>
 #include <kern/sched.h>
 #include <kern/sched_prim.h>
 #include <kern/ipc_sched.h>
 #include <kern/task.h>
 #include <kern/thread.h>
-#include <kern/time_out.h>
 #include <machine/machspl.h>	/* for splsched */
 
 #if	MACH_FIXPRI
@@ -139,8 +139,6 @@ boolean_t  swtch_pri(pri)
 	       myprocessor->processor_set->runq.count > 0);
 }
 
-extern int hz;
-
 void thread_switch_continue()
 {
 	register thread_t	cur_thread = current_thread();
diff --git a/kern/thread.c b/kern/thread.c
index 6ca91a7..71f222c 100644
--- a/kern/thread.c
+++ b/kern/thread.c
@@ -52,6 +52,7 @@
 #include <kern/thread_swap.h>
 #include <kern/host.h>
 #include <kern/zalloc.h>
+#include <kern/mach_clock.h>
 #include <vm/vm_kern.h>
 #include <ipc/ipc_kmsg.h>
 #include <ipc/ipc_port.h>
@@ -68,8 +69,6 @@ struct zone *thread_zone;
 queue_head_t		reaper_queue;
 decl_simple_lock_data(,	reaper_lock)
 
-extern int		tick;
-
 extern void		pcb_module_init(void);
 
 /* private */
diff --git a/kern/thread.h b/kern/thread.h
index 0ac6a32..18905f5 100644
--- a/kern/thread.h
+++ b/kern/thread.h
@@ -43,11 +43,11 @@
 #include <mach/vm_prot.h>
 #include <kern/ast.h>
 #include <kern/cpu_number.h>
+#include <kern/mach_clock.h>
 #include <kern/queue.h>
 #include <kern/pc_sample.h>
 #include <kern/processor.h>
 #include <kern/sched_prim.h>	/* event_t, continuation_t */
-#include <kern/time_out.h>
 #include <kern/timer.h>
 #include <kern/lock.h>
 #include <kern/sched.h>
diff --git a/kern/zalloc.c b/kern/zalloc.c
index 1f415f7..9728d46 100644
--- a/kern/zalloc.c
+++ b/kern/zalloc.c
@@ -39,8 +39,8 @@
 #include <kern/debug.h>
 #include <kern/macro_help.h>
 #include <kern/printf.h>
+#include <kern/mach_clock.h>
 #include <kern/sched.h>
-#include <kern/time_out.h>
 #include <kern/zalloc.h>
 #include <mach/vm_param.h>
 #include <vm/vm_kern.h>
diff --git a/linux/dev/init/main.c b/linux/dev/init/main.c
index c768169..934cb6f 100644
--- a/linux/dev/init/main.c
+++ b/linux/dev/init/main.c
@@ -79,7 +79,6 @@ struct drive_info_struct
  */
 static void calibrate_delay (void);
 
-extern int hz;
 extern vm_offset_t phys_last_addr;
 
 extern void *alloc_contig_mem (unsigned, unsigned, unsigned, vm_page_t *);