--- Gnu-Mach/kern/ipc_sched.c	2020/09/02 04:36:57	1.1.1.1
+++ Gnu-Mach/kern/ipc_sched.c	2020/09/02 04:47:27	1.1.1.3
@@ -24,17 +24,15 @@
  * the rights to redistribute these changes.
  */
 
-#include <cpus.h>
-#include <mach_host.h>
-
 #include <mach/message.h>
 #include <kern/counters.h>
 #include "cpu_number.h"
+#include <kern/debug.h>
 #include <kern/lock.h>
+#include <kern/mach_clock.h>
 #include <kern/thread.h>
 #include <kern/sched_prim.h>
 #include <kern/processor.h>
-#include <kern/time_out.h>
 #include <kern/thread_swap.h>
 #include <kern/ipc_sched.h>
 #include <machine/machspl.h>	/* for splsched/splx */
@@ -168,7 +166,6 @@ thread_will_wait_with_timeout(
 #define	check_bound_processor(thread)	TRUE
 #endif	/* NCPUS > 1 */
 
-#ifdef CONTINUATIONS
 /*
  *	Routine:	thread_handoff
  *	Purpose:
@@ -185,9 +182,9 @@ thread_will_wait_with_timeout(
 
 boolean_t
 thread_handoff(
-	register thread_t old,
-	register continuation_t continuation,
-	register thread_t new)
+	thread_t old,
+	continuation_t continuation,
+	thread_t new)
 {
 	spl_t	s;
 
@@ -217,7 +214,7 @@ thread_handoff(
 		thread_unlock(new);
 		(void) splx(s);
 
-		counter_always(c_thread_handoff_misses++);
+		counter(c_thread_handoff_misses++);
 		return FALSE;
 	}
 
@@ -271,7 +268,7 @@ thread_handoff(
 			 */
 			old->wake_active = FALSE;
 			thread_unlock(old);
-			thread_wakeup((event_t)&old->wake_active);
+			thread_wakeup(TH_EV_WAKE_ACTIVE(old));
 			goto after_old_thread;
 		}
 	} else
@@ -281,7 +278,6 @@ thread_handoff(
     after_old_thread:
 	(void) splx(s);
 
-	counter_always(c_thread_handoff_hits++);
+	counter(c_thread_handoff_hits++);
 	return TRUE;
 }
-#endif /* CONTINUATIONS */