[PATCH 29/68] i386/i386at/pic_isa.c: remove forward declaration

[Marin Ramesa]

* i386/i386at/pic_isa.c: Include kern/mach_clock.h.
(hardclock): Remove forward declaration.
* kern/mach_clock.h: Include machine/thread.h.
(hardclock): Add prototype.

---
 i386/i386at/pic_isa.c | 2 +-
 kern/mach_clock.h     | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/i386/i386at/pic_isa.c b/i386/i386at/pic_isa.c
index e48fb50..8afd93e 100644
--- a/i386/i386at/pic_isa.c
+++ b/i386/i386at/pic_isa.c
@@ -29,9 +29,9 @@
 #include <i386/pic.h>
 #include <i386/fpu.h>
 #include <i386at/kd.h>
+#include <kern/mach_clock.h>
 
 /* These interrupts are always present */
-extern void hardclock();
 
 void (*ivect[NINTR])() = {
        /* 00 */        hardclock,      /* always */
diff --git a/kern/mach_clock.h b/kern/mach_clock.h
index 72189af..94e0a11 100644
--- a/kern/mach_clock.h
+++ b/kern/mach_clock.h
@@ -29,7 +29,7 @@
 #include <mach/time_value.h>
 #include <kern/host.h>
 #include <kern/queue.h>
-
+#include <machine/thread.h>
 
 /* Timers in kernel.  */
 extern unsigned long   elapsed_ticks;  /* number of ticks elapsed since bootup 
*/
@@ -107,4 +107,11 @@ extern boolean_t untimeout(timer_func_t *fcn, void *param);
 extern int timeopen(void);
 extern int timeclose(void);
 
+void hardclock(
+       int                             iunit,
+       int                             old_ipl,
+       int                             irq,
+       char *                          ret_addr,
+       struct i386_interrupt_state     *regs);
+
 #endif /* _KERN_MACH_CLOCK_H_ */
-- 
1.8.1.4