--- Gnu-Mach/kern/sched.h	2020/09/02 04:42:44	1.1.1.2
+++ Gnu-Mach/kern/sched.h	2020/09/02 04:47:29	1.1.1.4
@@ -35,13 +35,9 @@
 #ifndef	_KERN_SCHED_H_
 #define _KERN_SCHED_H_
 
-#include <cpus.h>
-#include <mach_fixpri.h>
-#include <simple_clock.h>
-#include <stat_time.h>
-
 #include <kern/queue.h>
 #include <kern/lock.h>
+#include <kern/kern_types.h>
 #include <kern/macro_help.h>
 
 #if	MACH_FIXPRI
@@ -64,7 +60,7 @@
 #include <machine/sched_param.h>
 
 #endif	/* STAT_TIME */
-#define NRQS	32			/* 32 run queues per cpu */
+#define NRQS	50			/* 50 run queues per cpu */
 
 struct run_queue {
 	queue_head_t		runq[NRQS];	/* one for each priority */
@@ -111,8 +107,8 @@ typedef struct run_queue	*run_queue_t;
  *	Scheduler routines.
  */
 
-extern struct run_queue	*rem_runq();
-extern struct thread	*choose_thread();
+extern struct run_queue	*rem_runq(thread_t);
+extern struct thread	*choose_thread(processor_t);
 extern queue_head_t	action_queue;	/* assign/shutdown queue */
 decl_simple_lock_data(extern,action_lock);
 
@@ -122,7 +118,7 @@ extern int		min_quantum;	/* defines max
  *	Default base priorities for threads.
  */
 #define BASEPRI_SYSTEM	6
-#define BASEPRI_USER	12
+#define BASEPRI_USER	25
 
 /*
  *	Macro to check for invalid priorities.
@@ -157,7 +153,7 @@ extern unsigned	sched_tick;
 
 #define thread_timer_delta(thread)  				\
 MACRO_BEGIN							\
-	register unsigned	delta;				\
+	unsigned	delta;					\
 								\
 	delta = 0;						\
 	TIMER_DELTA((thread)->system_timer,			\