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/machine.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'kern/machine.c')

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
-- 
cgit v1.2.3