12 files changed, 27 insertions, 54 deletions
diff --git a/i386/i386/db_disasm.c b/i386/i386/db_disasm.c
index de268ed8..9271e08c 100644
--- a/i386/i386/db_disasm.c
+++ b/i386/i386/db_disasm.c
@@ -862,7 +862,7 @@ int db_lengths[] = {
 /*
  * Read address at location and return updated location.
  */
-db_addr_t
+static db_addr_t
 db_read_address(
 	db_addr_t	loc,
 	int		short_addr,
@@ -948,7 +948,7 @@ db_read_address(
 	return loc;
 }
 
-void
+static void
 db_print_address(
 	const char *		seg,
 	int			size,
@@ -980,7 +980,7 @@ db_print_address(
  * Disassemble floating-point ("escape") instruction
  * and return updated location.
  */
-db_addr_t
+static db_addr_t
 db_disasm_esc(
 	db_addr_t	loc,
 	int		inst,
diff --git a/i386/i386/db_interface.c b/i386/i386/db_interface.c
index 0b11910d..3a331490 100644
--- a/i386/i386/db_interface.c
+++ b/i386/i386/db_interface.c
@@ -236,7 +236,7 @@ db_clear_hw_watchpoint(
 /*
  * Print trap reason.
  */
-void
+static void
 kdbprinttrap(
 	int	type, 
 	int	code)
@@ -444,7 +444,7 @@ kdb_kentry(
 
 boolean_t db_no_vm_fault = TRUE;
 
-int
+static int
 db_user_to_phys_address(
 	const task_t	task,
 	vm_offset_t	addr,
diff --git a/i386/i386/db_trace.c b/i386/i386/db_trace.c
index 5e2bef8b..5eebc727 100644
--- a/i386/i386/db_trace.c
+++ b/i386/i386/db_trace.c
@@ -114,7 +114,7 @@ struct i386_kregs {
 	{ 0 },
 };
 
-long *
+static long *
 db_lookup_i386_kreg(
 	const char *name,
 	const long *kregp)
@@ -182,7 +182,7 @@ db_i386_reg_value(
 	    *valuep = *dp;
 }
 
-void
+static void
 db_find_trace_symbols(void)
 {
 	db_expr_t	value;
@@ -210,7 +210,7 @@ db_find_trace_symbols(void)
  */
 const int db_numargs_default = 5;
 
-int
+static int
 db_numargs(
 	struct i386_frame *fp,
 	task_t task)
@@ -261,7 +261,7 @@ struct interrupt_frame {
  *   It might be possible to dig out from the next frame up the name
  *   of the function that faulted, but that could get hairy.
  */
-void
+static void
 db_nextframe(
 	struct i386_frame **lfp,	/* in/out */
 	struct i386_frame **fp,		/* in/out */
@@ -562,7 +562,7 @@ db_i386_stack_trace(
 
 #if	CTHREADS_SUPPORT
 
-thread_t
+static thread_t
 db_find_kthread(
 	vm_offset_t	ustack_base,
 	vm_size_t	ustack_top,
@@ -613,7 +613,7 @@ const int db_cprocsw_pc_offset = 4 * 4;
 
 extern jmp_buf_t *db_recover;
 
-void db_trace_cproc(
+static void db_trace_cproc(
 	vm_offset_t	cproc,
 	thread_t	thread)
 {
diff --git a/i386/i386/fpu.c b/i386/i386/fpu.c
index e184ca72..36bdb41d 100644
--- a/i386/i386/fpu.c
+++ b/i386/i386/fpu.c
@@ -899,23 +899,6 @@ ASSERT_IPL(SPL0);
 	ifps->fp_valid = FALSE;		/* in FPU */
 }
 
-/*
- * Allocate and initialize FP state for current thread.
- * Don't load state.
- *
- * Locking not needed; always called on the current thread.
- */
-void
-fp_state_alloc(void)
-{
-	pcb_t	pcb = current_thread()->pcb;
-	struct i386_fpsave_state *ifps;
-
-	ifps = (struct i386_fpsave_state *)kmem_cache_alloc(&ifps_cache);
-	memcpy(ifps, fp_default_state, fp_xsave_size);
-	pcb->ims.ifps = ifps;
-}
-
 #if	(defined(AT386) || defined(ATX86_64)) && !defined(MACH_XEN)
 /*
  *	Handle a coprocessor error interrupt on the AT386.
diff --git a/i386/i386/hardclock.c b/i386/i386/hardclock.c
index 9b9df5a9..9ac4f51d 100644
--- a/i386/i386/hardclock.c
+++ b/i386/i386/hardclock.c
@@ -34,6 +34,7 @@
 
 #include <kern/mach_clock.h>
 #include <i386/thread.h>
+#include <i386/hardclock.h>
 
 #if	defined(AT386) || defined(ATX86_64)
 #include <i386/ipl.h>
diff --git a/i386/i386/io_map.c b/i386/i386/io_map.c
index 3e45f316..368f200b 100644
--- a/i386/i386/io_map.c
+++ b/i386/i386/io_map.c
@@ -36,7 +36,7 @@ extern vm_offset_t kernel_virtual_start;
  * Allocate and map memory for devices that may need to be mapped before
  * Mach VM is running.
  */
-vm_offset_t
+static vm_offset_t
 io_map(
 	phys_addr_t	phys_addr,
 	vm_size_t	size)
diff --git a/i386/i386/loose_ends.c b/i386/i386/loose_ends.c
index 64b53b71..7e7f943b 100644
--- a/i386/i386/loose_ends.c
+++ b/i386/i386/loose_ends.c
@@ -26,6 +26,8 @@
 /*
  */
 
+#include <i386/i386/loose_ends.h>
+
 #ifndef NDEBUG
 #define MACH_ASSERT 1
 #else
@@ -45,17 +47,3 @@ delay(int n)
 {
 	DELAY(n);
 }
-
-#if	MACH_ASSERT
-
-/*
- * Machine-dependent routine to fill in an array with up to callstack_max
- * levels of return pc information.
- */
-void machine_callstack(
-	const unsigned long	*buf,
-	int			callstack_max)
-{
-}
-
-#endif	/* MACH_ASSERT */
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index 5b932889..70737479 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -1448,7 +1448,7 @@ kd_parseesc(void)
  */
 
 #define reverse_video_char(a)       (((a) & 0x88) | ((((a) >> 4) | ((a) << 4)) & 0x77))
-void
+static void
 kd_update_kd_attr(void)
 {
 	kd_attr = kd_color;
@@ -2721,7 +2721,7 @@ bmpput(
  * bmpcp1char: copy 1 char from one place in the frame buffer to
  * another.
  */
-void
+static void
 bmpcp1char(
 	csrpos_t from, 
 	csrpos_t to)
diff --git a/i386/i386at/kd_event.c b/i386/i386at/kd_event.c
index 518e4859..5b1f7098 100644
--- a/i386/i386at/kd_event.c
+++ b/i386/i386at/kd_event.c
@@ -90,7 +90,7 @@ static boolean_t initialized = FALSE;
  * kbdinit - set up event queue.
  */
 
-void
+static void
 kbdinit(void)
 {
 	spl_t s = SPLKD();
@@ -304,7 +304,7 @@ kbd_enqueue(kd_event *ev)
 u_int X_kdb_enter_str[512], X_kdb_exit_str[512];
 int   X_kdb_enter_len = 0,  X_kdb_exit_len = 0;
 
-void
+static void
 kdb_in_out(const u_int *p)
 {
 	int t = p[0];
diff --git a/i386/i386at/mem.c b/i386/i386at/mem.c
index ac0fd301..f46fc038 100644
--- a/i386/i386at/mem.c
+++ b/i386/i386at/mem.c
@@ -27,6 +27,7 @@
 #include <device/io_req.h>
 #include <i386/model_dep.h>
 #include <i386at/biosmem.h>
+#include <i386at/mem.h>
 
 /* This provides access to any memory that is not main RAM */
 
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index 1819526b..0fc99406 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -361,7 +361,7 @@ register_boot_data(const struct multiboot_raw_info *mbi)
  * Basic PC VM initialization.
  * Turns on paging and changes the kernel segments to use high linear addresses.
  */
-void
+static void
 i386at_init(void)
 {
 	/* XXX move to intel/pmap.h */
diff --git a/i386/i386at/rtc.c b/i386/i386at/rtc.c
index d771df8e..b2068416 100644
--- a/i386/i386at/rtc.c
+++ b/i386/i386at/rtc.c
@@ -60,7 +60,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 static boolean_t first_rtcopen_ever = TRUE;
 
-void
+static void
 rtcinit(void)
 {
 	outb(RTC_ADDR, RTC_A);
@@ -70,7 +70,7 @@ rtcinit(void)
 }
 
 
-int
+static int
 rtcget(struct rtc_st *st)
 {
 	unsigned char *regs = (unsigned char *)st;
@@ -87,7 +87,7 @@ rtcget(struct rtc_st *st)
 	return(0);
 }
 
-void
+static void
 rtcput(struct rtc_st *st)
 {
 	unsigned char *regs = (unsigned char *)st;
@@ -111,7 +111,7 @@ extern struct timeval time;
 
 static int month[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 
-int
+static int
 yeartoday(int year)
 {
 	if (year%4)
@@ -134,13 +134,13 @@ yeartoday(int year)
 	return 366;
 }
 
-int
+static int
 hexdectodec(char n)
 {
 	return(((n>>4)&0x0F)*10 + (n&0x0F));
 }
 
-char
+static char
 dectohexdec(int n)
 {
 	return((char)(((n/10)<<4)&0xF0) | ((n%10)&0x0F));