--- Gnu-Mach/kern/lock_mon.c	2020/09/02 04:42:43	1.1.1.2
+++ Gnu-Mach/kern/lock_mon.c	2020/09/02 04:45:14	1.1.1.3
@@ -38,12 +38,9 @@
  *		Depending on hardware also records time spent with locks held
  */
 
-#include <cpus.h>
-#include <mach_mp_debug.h>
-#include <mach_lock_mon.h>
-#include <time_stamp.h>
-
 #include <sys/types.h>
+#include <string.h>
+
 #include <mach/machine/vm_types.h>
 #include <mach/boolean.h>
 #include <kern/thread.h>
@@ -268,10 +265,10 @@ lock_info_clear()
 	for (bucket = 0; bucket < LOCK_INFO_HASH_COUNT; bucket++) {
 		li = &lock_info[bucket].info[0];
 		for (i= 0; i< LOCK_INFO_PER_BUCKET; i++, li++) {
-			bzero(li, sizeof(struct lock_info));
+			memset(li, 0, sizeof(struct lock_info));
 		}
 	}
-	bzero(&default_lock_info, sizeof(struct lock_info));
+	memset(&default_lock_info, 0, sizeof(struct lock_info));
 }
 
 print_lock_info(li)
@@ -284,7 +281,7 @@ struct lock_info *li;
 		   li->masked, (li->masked*100)/sum,
 		   li->stack, li->stack/sum,
 		   li->time, li->time/sum);
-	db_search_symbol(li->lock, 0, &off);
+	db_free_symbol(db_search_symbol(li->lock, 0, &off));
 	if (off < 1024)
 		db_printsym(li->lock, 0);
 	else {
@@ -351,7 +348,7 @@ decl_simple_lock_data(, *lock)
 				return;
 			db_printf("cpu %d looping on simple_lock(%x) called by %x\n",
 				cpu_number(), lock, *(((int *)&lock) -1));
-			Debugger();
+			SoftDebugger("simple_lock timeout");
 			count = 0;
 		}
 }
@@ -365,7 +362,7 @@ retry_bit_lock(index, addr)
 		if (count++ > 1000000) {
 			db_printf("cpu %d looping on bit_lock(%x, %x) called by %x\n",
 				cpu_number(), index, addr, *(((int *)&index) -1));
-			Debugger();
+			SoftDebugger("bit_lock timeout");
 			count = 0;
 		}
 }