From d1ee506ebd11d305e5384ea0edf072d8076b4eac Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 9 Nov 2006 23:33:45 +0000
Subject: 2006-11-09  Barry deFreese  <bddebian@comcast.net>

[task #5726 --- ``GCC built-in functions'']
	* include/printf.h: Move file...
	* kern/printf.h: ... here.
	* kern/debug.h (panic_init, panic): Add prototypes.
	* chips/busses.c: Don't include `printf.h', include `kern/printf.h'
	and `kern/debug.h'.
	* ddb/db_command.c: Likewise.
	* ddb/db_cond.c: Likewise.
	* ddb/db_output.c: Likewise.
	* device/cirbuf.c: Likewise.
	* device/cons.c: Likewise.
	* device/dev_name.c: Likewise.
	* device/dev_pager.c: Likewise.
	* device/device_init.c: Likewise.
	* device/dk_label.c: Likewise.
	* device/ds_routines.c: Likewise.
	* device/net_io.c: Likewise.
	* device/subrs.c: Likewise.
	* i386/i386/debug_i386.c: Likewise.
	* i386/i386/fpe_linkage.c: Likewise.
	* i386/i386/fpu.c: Likewise.
	* i386/i386/io_map.c: Likewise.
	* i386/i386/kttd_interface.c: Likewise.
	* i386/i386/mp_desc.c: Likewise.
	* i386/i386/pcb.c: Likewise.
	* i386/i386/pic.c: Likewise.
	* i386/i386/trap.c: Likewise.
	* i386/i386at/autoconf.c: Likewise.
	* i386/i386at/com.c: Likewise.
	* i386/i386at/i386at_ds_routines.c: Likewise.
	* i386/i386at/kd.c: Likewise.
	* i386/i386at/kd_event.c: Likewise.
	* i386/i386at/kd_mouse.c: Likewise.
	* i386/i386at/lpr.c: Likewise.
	* i386/i386at/model_dep.c: Likewise.
	* i386/intel/pmap.c: Likewise.
	* ipc/ipc_entry.c: Likewise.
	* ipc/ipc_hash.c: Likewise.
	* ipc/ipc_kmsg.c: Likewise.
	* ipc/ipc_mqueue.c: Likewise.
	* ipc/ipc_notify.c: Likewise.
	* ipc/ipc_object.c: Likewise.
	* ipc/ipc_port.c: Likewise.
	* ipc/ipc_pset.c: Likewise.
	* ipc/ipc_right.c: Likewise.
	* ipc/mach_msg.c: Likewise.
	* ipc/mach_port.c: Likewise.
	* ipc/mach_rpc.c: Likewise.
	* kern/act.c: Likewise.
	* kern/ast.c: Likewise.
	* kern/bootstrap.c: Likewise.
	* kern/debug.c: Likewise.
	* kern/eventcount.c: Likewise.
	* kern/exception.c: Likewise.
	* kern/host.c: Likewise.
	* kern/ipc_host.c: Likewise.
	* kern/ipc_kobject.c: Likewise.
	* kern/ipc_mig.c: Likewise.
	* kern/ipc_sched.c: Likewise.
	* kern/ipc_tt.c: Likewise.
	* kern/kalloc.c: Likewise.
	* kern/lock.c: Likewise.
	* kern/mach_clock.c: Likewise.
	* kern/machine.c: Likewise.
	* kern/pc_sample.c: Likewise.
	* kern/printf.c: Likewise.
	* kern/processor.c: Likewise.
	* kern/sched_prim.c: Likewise.
	* kern/server_loop.ch: Likewise.
	* kern/startup.c: Likewise.
	* kern/task.c: Likewise.
	* kern/thread.c: Likewise.
	* kern/thread_swap.c: Likewise.
	* kern/xpr.c: Likewise.
	* kern/zalloc.c: Likewise.
	* vm/memory_object.c: Likewise.
	* vm/vm_debug.c: Likewise.
	* vm/vm_fault.c: Likewise.
	* vm/vm_kern.c: Likewise.
	* vm/vm_map.c: Likewise.
	* vm/vm_object.c: Likewise.
	* vm/vm_object.h: Likewise.
	* vm/vm_pageout.c: Likewise.
	* vm/vm_resident.c: Likewise.
---
 i386/i386/debug_i386.c           | 2 +-
 i386/i386/fpe_linkage.c          | 1 +
 i386/i386/fpu.c                  | 3 ++-
 i386/i386/io_map.c               | 2 +-
 i386/i386/kttd_interface.c       | 2 +-
 i386/i386/mp_desc.c              | 1 +
 i386/i386/pcb.c                  | 1 +
 i386/i386/pic.c                  | 2 +-
 i386/i386/trap.c                 | 3 ++-
 i386/i386at/autoconf.c           | 2 +-
 i386/i386at/com.c                | 2 +-
 i386/i386at/i386at_ds_routines.c | 2 +-
 i386/i386at/kd.c                 | 3 ++-
 i386/i386at/kd_event.c           | 2 +-
 i386/i386at/kd_mouse.c           | 2 +-
 i386/i386at/lpr.c                | 2 +-
 i386/i386at/model_dep.c          | 3 ++-
 i386/intel/pmap.c                | 3 ++-
 18 files changed, 23 insertions(+), 15 deletions(-)

(limited to 'i386')

diff --git a/i386/i386/debug_i386.c b/i386/i386/debug_i386.c
index d758e43..b897e63 100644
--- a/i386/i386/debug_i386.c
+++ b/i386/i386/debug_i386.c
@@ -21,7 +21,7 @@
  *      Author: Bryan Ford, University of Utah CSL
  */
 
-#include <printf.h>
+#include <kern/printf.h>
 
 #include "thread.h"
 #include "trap.h"
diff --git a/i386/i386/fpe_linkage.c b/i386/i386/fpe_linkage.c
index be39420..b91d825 100644
--- a/i386/i386/fpe_linkage.c
+++ b/i386/i386/fpe_linkage.c
@@ -37,6 +37,7 @@
 #include <mach/thread_status.h>
 
 #include <kern/cpu_number.h>
+#include <kern/debug.h> /* for panic() */
 #include <kern/thread.h>
 
 #include <vm/vm_kern.h>
diff --git a/i386/i386/fpu.c b/i386/i386/fpu.c
index c61b4a0..fdeb5c7 100644
--- a/i386/i386/fpu.c
+++ b/i386/i386/fpu.c
@@ -27,15 +27,16 @@
  * Support for 80387 floating point or FP emulator.
  */
 
-#include <printf.h>
 #include <string.h>
 
 #include <mach/exception.h>
 #include <mach/machine/thread_status.h>
 #include <mach/machine/fp_reg.h>
 
+#include <kern/debug.h> /* for panic() */
 #include <machine/machspl.h>	/* spls */
 #include <kern/mach_param.h>
+#include <kern/printf.h>
 #include <kern/thread.h>
 #include <kern/zalloc.h>
 
diff --git a/i386/i386/io_map.c b/i386/i386/io_map.c
index 00c9a7a..7ed0e26 100644
--- a/i386/i386/io_map.c
+++ b/i386/i386/io_map.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  */
 
-#include <printf.h>
+#include <kern/printf.h>
 #include <mach/vm_param.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_map.h>
diff --git a/i386/i386/kttd_interface.c b/i386/i386/kttd_interface.c
index 016bd9c..d744c0e 100644
--- a/i386/i386/kttd_interface.c
+++ b/i386/i386/kttd_interface.c
@@ -27,7 +27,7 @@
 #if MACH_TTD
 
 #include <sys/types.h>
-#include <printf.h>
+#include <kern/printf.h>
 
 #include <mach/machine/eflags.h>
 
diff --git a/i386/i386/mp_desc.c b/i386/i386/mp_desc.c
index f5b07ab..dc18434 100644
--- a/i386/i386/mp_desc.c
+++ b/i386/i386/mp_desc.c
@@ -29,6 +29,7 @@
 #include <string.h> 
 
 #include <kern/cpu_number.h>
+#include <kern/debug.h> /* for panic() */
 #include <mach/machine.h>
 #include <vm/vm_kern.h>
 
diff --git a/i386/i386/pcb.c b/i386/i386/pcb.c
index a18a5e6..2fd96c6 100644
--- a/i386/i386/pcb.c
+++ b/i386/i386/pcb.c
@@ -33,6 +33,7 @@
 
 #include "vm_param.h"
 #include <kern/counters.h>
+#include <kern/debug.h> /* for panic() */
 #include <kern/mach_param.h>
 #include <kern/thread.h>
 #include <kern/sched_prim.h>
diff --git a/i386/i386/pic.c b/i386/i386/pic.c
index 58953fc..f73745c 100644
--- a/i386/i386/pic.c
+++ b/i386/i386/pic.c
@@ -50,7 +50,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
 #include <sys/types.h>
-#include <printf.h>
+#include <kern/printf.h>
 #include <i386/ipl.h>
 #include <i386/pic.h>
 #include <i386/machspl.h>
diff --git a/i386/i386/trap.c b/i386/i386/trap.c
index 16a9405..5b8962e 100644
--- a/i386/i386/trap.c
+++ b/i386/i386/trap.c
@@ -28,7 +28,6 @@
  */
 
 #include <sys/types.h>
-#include <printf.h>
 #include <string.h>
 
 #include <mach/machine/eflags.h>
@@ -44,6 +43,8 @@
 #include <vm/vm_map.h>
 
 #include <kern/ast.h>
+#include <kern/debug.h> /* for panic() */
+#include <kern/printf.h>
 #include <kern/thread.h>
 #include <kern/task.h>
 #include <kern/sched.h>
diff --git a/i386/i386at/autoconf.c b/i386/i386at/autoconf.c
index d6cfe3d..48e1278 100644
--- a/i386/i386at/autoconf.c
+++ b/i386/i386at/autoconf.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  */
 
-#include <printf.h>
+#include <kern/printf.h>
 #ifdef	MACH_KERNEL
 #include <mach/std_types.h>
 #else	/* MACH_KERNEL */
diff --git a/i386/i386at/com.c b/i386/i386at/com.c
index 7ff8815..6142999 100644
--- a/i386/i386at/com.c
+++ b/i386/i386at/com.c
@@ -28,7 +28,7 @@
 
 #include <mach/std_types.h>
 #include <sys/types.h>
-#include <printf.h>
+#include <kern/printf.h>
 #include <sys/time.h>
 #include <device/conf.h>
 #include <device/errno.h>
diff --git a/i386/i386at/i386at_ds_routines.c b/i386/i386at/i386at_ds_routines.c
index bc2a433..0cd8b54 100644
--- a/i386/i386at/i386at_ds_routines.c
+++ b/i386/i386at/i386at_ds_routines.c
@@ -23,7 +23,7 @@
  *      Author: Shantanu Goel, University of Utah CSL
  */
 
-#include <printf.h>
+#include <kern/printf.h>
 
 #include <mach/boolean.h>
 #include <mach/kern_return.h>
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index 09ea902..c1389c2 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -77,7 +77,8 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* $ Header:  $ */
 
 #include <sys/types.h>
-#include <printf.h>
+#include <kern/debug.h> /* for panic() */
+#include <kern/printf.h>
 #include <kern/time_out.h>
 #include <device/conf.h>
 #include <device/tty.h>
diff --git a/i386/i386at/kd_event.c b/i386/i386at/kd_event.c
index b10d7f3..c421820 100644
--- a/i386/i386at/kd_event.c
+++ b/i386/i386at/kd_event.c
@@ -56,7 +56,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <mach/boolean.h>
 #include <sys/types.h>
-#include <printf.h>
+#include <kern/printf.h>
 #include <string.h>
 
 #ifdef	MACH_KERNEL
diff --git a/i386/i386at/kd_mouse.c b/i386/i386at/kd_mouse.c
index a89d6b2..52358f1 100644
--- a/i386/i386at/kd_mouse.c
+++ b/i386/i386at/kd_mouse.c
@@ -66,7 +66,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <mach/boolean.h>
 #include <sys/types.h>
-#include <printf.h>
+#include <kern/printf.h>
 #ifdef	MACH_KERNEL
 #include <device/errno.h>
 #include <device/io_req.h>
diff --git a/i386/i386at/lpr.c b/i386/i386at/lpr.c
index f071d23..1483687 100644
--- a/i386/i386at/lpr.c
+++ b/i386/i386at/lpr.c
@@ -33,7 +33,7 @@
 #ifdef	MACH_KERNEL
 #include <mach/std_types.h>
 #include <sys/types.h>
-#include <printf.h>
+#include <kern/printf.h>
 #include <sys/time.h>
 #include <device/conf.h>
 #include <device/errno.h>
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index f31a8d7..06b8d12 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -32,7 +32,6 @@
  *	Basic initialization for I386 - ISA bus machines.
  */
 
-#include <printf.h>
 #include <string.h>
 
 #include <mach/vm_param.h>
@@ -44,6 +43,8 @@
 #include <kern/time_out.h>
 #include <kern/assert.h>
 #include <kern/cpu_number.h>
+#include <kern/debug.h> /* for panic() */
+#include <kern/printf.h>
 #include <sys/time.h>
 #include <vm/vm_page.h>
 #include <i386/machspl.h>
diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
index e75d054..ec19766 100644
--- a/i386/intel/pmap.c
+++ b/i386/intel/pmap.c
@@ -55,12 +55,13 @@
  *	and to when physical maps must be made correct.
  */
 
-#include <printf.h>
 #include <string.h>
 
 #include <mach/machine/vm_types.h>
 
 #include <mach/boolean.h>
+#include <kern/debug.h> /* for panic() */
+#include <kern/printf.h>
 #include <kern/thread.h>
 #include <kern/zalloc.h>
 
-- 
cgit v1.2.3