From c94759ba7930feda649e73aabf710a4dcfcd0403 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 17 Jul 2008 00:28:06 +0000
Subject: 2008-07-15  Barry deFreese  <bddebian@comcast.net>

* i386/i386/model_dep.h: New header.
	* i386/i386at/model_dep.c: Include <i386/model_dep.h>.
	* kern/debug.c: Include <machine/model_dep.h>.
	* kern/mach_clock.c: Likewise.
	* kern/sched_prim.c: Likewise.
	* kern/startup.c: Likewise.
	* kern/machine.c: Likewise.
	(halt_cpu): Remove prototype.
	* vm/pmap.h (pmap_grab_page): Add prototype.
---
 kern/debug.c      | 2 ++
 kern/mach_clock.c | 1 +
 kern/machine.c    | 5 +----
 kern/sched_prim.c | 1 +
 kern/startup.c    | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'kern')

diff --git a/kern/debug.c b/kern/debug.c
index e81c6a2c..2c9e7612 100644
--- a/kern/debug.c
+++ b/kern/debug.c
@@ -33,6 +33,8 @@
 
 #include <kern/debug.h>
 
+#include <machine/model_dep.h>
+
 extern void cnputc();
 void Debugger() __attribute__ ((noreturn));
 
diff --git a/kern/mach_clock.c b/kern/mach_clock.c
index 22c4a74a..781101b7 100644
--- a/kern/mach_clock.c
+++ b/kern/mach_clock.c
@@ -59,6 +59,7 @@
 #include <sys/time.h>
 #include <machine/mach_param.h>	/* HZ */
 #include <machine/machspl.h>
+#include <machine/model_dep.h>
 
 #if MACH_PCSAMPLE
 #include <kern/pc_sample.h>
diff --git a/kern/machine.c b/kern/machine.c
index 871801e0..97181a84 100644
--- a/kern/machine.c
+++ b/kern/machine.c
@@ -51,6 +51,7 @@
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <machine/machspl.h>	/* for splsched */
+#include <machine/model_dep.h>
 #include <sys/reboot.h>
 
 
@@ -687,10 +688,6 @@ Restart_pset:
  *	running on the processor's shutdown stack.
  */
 
-#ifdef __GNUC__
-extern __volatile__ void halt_cpu();
-#endif
-
 #ifdef __GNUC__
 __volatile__
 #endif
diff --git a/kern/sched_prim.c b/kern/sched_prim.c
index db3c1f2e..ec3245d6 100644
--- a/kern/sched_prim.c
+++ b/kern/sched_prim.c
@@ -36,6 +36,7 @@
 #include <mach/machine.h>
 #include <machine/locore.h>
 #include <machine/machspl.h>	/* For def'n of splsched() */
+#include <machine/model_dep.h>
 #include <kern/ast.h>
 #include <kern/counters.h>
 #include <kern/cpu_number.h>
diff --git a/kern/startup.c b/kern/startup.c
index 6468ae2a..5eea5bcd 100644
--- a/kern/startup.c
+++ b/kern/startup.c
@@ -52,6 +52,7 @@
 #include <vm/vm_page.h>
 #include <machine/machspl.h>
 #include <machine/pmap.h>
+#include <machine/model_dep.h>
 #include <mach/version.h>
 
 
-- 
cgit v1.2.3