--- Gnu-Mach/vm/vm_debug.c	2020/09/02 04:42:52	1.1.1.2
+++ Gnu-Mach/vm/vm_debug.c	2020/09/02 04:47:45	1.1.1.4
@@ -31,9 +31,9 @@
  *	Exported kernel calls.  See mach_debug/mach_debug.defs.
  */
 
-#include <mach_vm_debug.h>
-#if MACH_VM_DEBUG
+#include <string.h>
 
+#include <kern/debug.h>
 #include <kern/thread.h>
 #include <mach/kern_return.h>
 #include <mach/machine/vm_types.h>
@@ -51,6 +51,7 @@
 #include <ipc/ipc_port.h>
 
 
+#if MACH_VM_DEBUG
 
 /*
  *	Routine:	vm_object_real_name
@@ -64,8 +65,7 @@
  */
 
 ipc_port_t
-vm_object_real_name(object)
-	vm_object_t object;
+vm_object_real_name(vm_object_t object)
 {
 	ipc_port_t port = IP_NULL;
 
@@ -93,11 +93,11 @@ vm_object_real_name(object)
  */
 
 kern_return_t
-mach_vm_region_info(map, address, regionp, portp)
-	vm_map_t map;
-	vm_offset_t address;
-	vm_region_info_t *regionp;
-	ipc_port_t *portp;
+mach_vm_region_info(
+	vm_map_t 		map,
+	vm_offset_t 		address,
+	vm_region_info_t 	*regionp,
+	ipc_port_t 		*portp)
 {
 	vm_map_t cmap;		/* current map in traversal */
 	vm_map_t nmap;		/* next map to look at */
@@ -183,11 +183,11 @@ mach_vm_region_info(map, address, region
  */
 
 kern_return_t
-mach_vm_object_info(object, infop, shadowp, copyp)
-	vm_object_t object;
-	vm_object_info_t *infop;
-	ipc_port_t *shadowp;
-	ipc_port_t *copyp;
+mach_vm_object_info(
+	vm_object_t 		object,
+	vm_object_info_t 	*infop,
+	ipc_port_t 		*shadowp,
+	ipc_port_t 		*copyp)
 {
 	vm_object_info_t info;
 	vm_object_info_state_t state;
@@ -277,10 +277,10 @@ mach_vm_object_info(object, infop, shado
  */
 
 kern_return_t
-mach_vm_object_pages(object, pagesp, countp)
-	vm_object_t object;
-	vm_page_info_array_t *pagesp;
-	natural_t *countp;
+mach_vm_object_pages(
+	vm_object_t 		object,
+	vm_page_info_array_t 	*pagesp,
+	natural_t 		*countp)
 {
 	vm_size_t size;
 	vm_offset_t addr;
@@ -403,8 +403,8 @@ mach_vm_object_pages(object, pagesp, cou
 				  addr + rsize_used, size - rsize_used);
 
 		if (size_used != rsize_used)
-			bzero((char *) (addr + size_used),
-			      rsize_used - size_used);
+			memset((void *) (addr + size_used), 0,
+			       rsize_used - size_used);
 
 		kr = vm_map_copyin(ipc_kernel_map, addr, rsize_used,
 				   TRUE, &copy);
@@ -433,7 +433,7 @@ mach_vm_object_pages(object, pagesp, cou
 
 kern_return_t
 host_virtual_physical_table_info(host, infop, countp)
-	host_t host;
+	const host_t host;
 	hash_info_bucket_array_t *infop;
 	natural_t *countp;
 {