diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | i386/i386at/model_dep.c | 1 | ||||
| -rw-r--r-- | kern/debug.c | 2 | ||||
| -rw-r--r-- | kern/mach_clock.c | 1 | ||||
| -rw-r--r-- | kern/machine.c | 5 | ||||
| -rw-r--r-- | kern/sched_prim.c | 1 | ||||
| -rw-r--r-- | kern/startup.c | 1 | ||||
| -rw-r--r-- | vm/pmap.h | 9 |
8 files changed, 25 insertions, 4 deletions
@@ -65,6 +65,15 @@ * device/tty.h (ttyinput_many, tty_cts, tty_get_status, tty_set_status, tty_flush, ttrstrt, ttstart, ttyclose, tty_portdeath, chario_init): Add prototypes. + * 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. 2008-07-04 Samuel Thibault <samuel.thibault@ens-lyon.org> diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c index fca4b94..d67f709 100644 --- a/i386/i386at/model_dep.c +++ b/i386/i386at/model_dep.c @@ -53,6 +53,7 @@ #include <i386/pmap.h> #include <i386/proc_reg.h> #include <i386/locore.h> +#include <i386/model_dep.h> /* Location of the kernel's symbol table. Both of these are 0 if none is available. */ diff --git a/kern/debug.c b/kern/debug.c index e81c6a2..2c9e761 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 22c4a74..781101b 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 871801e..97181a8 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> @@ -688,10 +689,6 @@ Restart_pset: */ #ifdef __GNUC__ -extern __volatile__ void halt_cpu(); -#endif - -#ifdef __GNUC__ __volatile__ #endif void processor_doshutdown(processor) diff --git a/kern/sched_prim.c b/kern/sched_prim.c index db3c1f2..ec3245d 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 6468ae2..5eea5bc 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> @@ -209,6 +209,15 @@ extern kern_return_t pmap_attribute(); #endif /* pmap_attribute */ /* + * Grab a physical page: + * the standard memory allocation mechanism + * during system initialization. + */ +extern vm_offset_t pmap_grab_page (void); + +extern boolean_t pmap_valid_page(vm_offset_t x); + +/* * Routines defined as macros. */ #ifndef PMAP_ACTIVATE_USER |