--- Gnu-Mach/kern/processor.c	2020/09/02 04:42:42	1.1.1.2
+++ Gnu-Mach/kern/processor.c	2020/09/02 04:45:12	1.1.1.3
@@ -27,17 +27,18 @@
  *	processor.c: processor and processor_set manipulation routines.
  */
 
-#include <cpus.h>
-#include <mach_fixpri.h>
-#include <mach_host.h>
+#include <string.h>
 
 #include <mach/boolean.h>
 #include <mach/policy.h>
 #include <mach/processor_info.h>
 #include <mach/vm_param.h>
 #include <kern/cpu_number.h>
+#include <kern/debug.h>
+#include <kern/kalloc.h>
 #include <kern/lock.h>
 #include <kern/host.h>
+#include <kern/ipc_tt.h>
 #include <kern/processor.h>
 #include <kern/sched.h>
 #include <kern/task.h>
@@ -46,8 +47,8 @@
 #include <ipc/ipc_port.h>
 
 #if	MACH_HOST
-#include <kern/zalloc.h>
-zone_t	pset_zone;
+#include <kern/slab.h>
+struct kmem_cache pset_cache;
 #endif	/* MACH_HOST */
 
 
@@ -112,10 +113,10 @@ void pset_sys_init(void)
 	register processor_t	processor;
 
 	/*
-	 * Allocate the zone for processor sets.
+	 * Allocate the cache for processor sets.
 	 */
-	pset_zone = zinit(sizeof(struct processor_set), 128*PAGE_SIZE,
-		PAGE_SIZE, 0, "processor sets");
+	kmem_cache_init(&pset_cache, "processor_set",
+			sizeof(struct processor_set), 0, NULL, NULL, NULL, 0);
 
 	/*
 	 * Give each processor a control port.
@@ -394,7 +395,7 @@ void pset_deallocate(
 	/*
 	 *	That's it, free data structure.
 	 */
-	zfree(pset_zone, (vm_offset_t)pset);
+	kmem_cache_free(&pset_cache, (vm_offset_t)pset);
 #endif	/* MACH_HOST */
 }
 
@@ -538,7 +539,7 @@ processor_set_create(
 	if (host == HOST_NULL)
 		return KERN_INVALID_ARGUMENT;
 
-	pset = (processor_set_t) zalloc(pset_zone);
+	pset = (processor_set_t) kmem_cache_alloc(&pset_cache);
 	pset_init(pset);
 	pset_reference(pset);	/* for new_set out argument */
 	pset_reference(pset);	/* for new_name out argument */
@@ -975,7 +976,7 @@ processor_set_things(
 				return KERN_RESOURCE_SHORTAGE;
 			}
 
-			bcopy((char *) addr, (char *) newaddr, size_needed);
+			memcpy((void *) newaddr, (void *) addr, size_needed);
 			kfree(addr, size);
 			addr = newaddr;
 		}