diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-09-19 23:20:44 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-09-19 23:20:44 +0200 |
| commit | ec91b8ae6735a3f2977dc886ea63ff28e1aeef41 (patch) | |
| tree | 67ac2a696cdd345b543d8415c74166bed11e9d4f /kern/machine.c | |
| parent | 9d952fb2d44ec2199a1d08999ff7a68aa26e9507 (diff) | |
| parent | 45fcd2d09c15820e58e2334b80f7367d2f98ebb7 (diff) | |
Merge branch 'master' into HEAD
Conflicts:
ChangeLog
kern/bootstrap.c
kern/debug.c
vm/vm_object.c
Diffstat (limited to 'kern/machine.c')
| -rw-r--r-- | kern/machine.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kern/machine.c b/kern/machine.c index 871801e0..bcf394c3 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> @@ -186,7 +187,6 @@ host_reboot(host, options) return (KERN_INVALID_HOST); if (options & RB_DEBUGGER) { - extern void Debugger(); Debugger("Debugger"); } else { #ifdef parisc @@ -688,10 +688,6 @@ Restart_pset: */ #ifdef __GNUC__ -extern __volatile__ void halt_cpu(); -#endif - -#ifdef __GNUC__ __volatile__ #endif void processor_doshutdown(processor) |