--- Gnu-Mach/kern/host.c	2020/09/02 04:36:57	1.1.1.1
+++ Gnu-Mach/kern/host.c	2020/09/02 04:45:22	1.1.1.2
@@ -29,10 +29,10 @@
  *	Non-ipc host functions.
  */
 
-#include <cpus.h>
-#include <mach_host.h>
+#include <string.h>
 
 #include <kern/assert.h>
+#include <kern/debug.h>
 #include <kern/kalloc.h>
 #include <kern/host.h>
 #include <mach/host_info.h>
@@ -41,11 +41,9 @@
 #include <mach/port.h>
 #include <kern/processor.h>
 #include <kern/ipc_host.h>
-
+#include <kern/mach_clock.h>
 #include <mach/vm_param.h>
 
-
-
 host_data_t	realhost;
 
 kern_return_t host_processors(
@@ -155,7 +153,6 @@ kern_return_t	host_info(
 	case HOST_SCHED_INFO:
 	    {
 		register host_sched_info_t	sched_info;
-		extern int	tick;	/* microseconds per clock tick */
 		extern int	min_quantum;
 					/* minimum quantum, in microseconds */
 
@@ -185,12 +182,12 @@ kern_return_t	host_info(
 
 		load_info = (host_load_info_t) info;
 
-		bcopy((char *) avenrun,
-		      (char *) load_info->avenrun,
-		      sizeof avenrun);
-		bcopy((char *) mach_factor,
-		      (char *) load_info->mach_factor,
-		      sizeof mach_factor);
+		memcpy(load_info->avenrun,
+		       avenrun,
+		       sizeof avenrun);
+		memcpy(load_info->mach_factor,
+		       mach_factor,
+		       sizeof mach_factor);
 
 		*count = HOST_LOAD_INFO_COUNT;
 		return KERN_SUCCESS;
@@ -305,7 +302,7 @@ host_processor_sets(
 			return KERN_RESOURCE_SHORTAGE;
 		}
 
-		bcopy((char *) addr, (char *) newaddr, size_needed);
+		memcpy((char *) newaddr, (char *) addr, size_needed);
 		kfree(addr, size);
 		psets = (processor_set_t *) newaddr;
 	}