--- Gnu-Mach/linux/dev/kernel/sched.c	2020/09/02 04:41:39	1.1.1.1
+++ Gnu-Mach/linux/dev/kernel/sched.c	2020/09/02 04:45:57	1.1.1.2
@@ -34,6 +34,9 @@
 
 #include <kern/thread.h>
 #include <kern/sched_prim.h>
+#include <kern/printf.h>
+
+#include <machine/machspl.h>
 
 #define MACH_INCLUDE
 #include <linux/sched.h>
@@ -41,21 +44,13 @@
 #include <linux/fs.h>
 #include <linux/blkdev.h>
 #include <linux/interrupt.h>
+#include <linux/dev/glue/glue.h>
 
 #include <asm/system.h>
 #include <asm/atomic.h>
 
 int securelevel = 0;
 
-extern void *alloc_contig_mem (unsigned, unsigned, unsigned, vm_page_t *);
-extern void free_contig_mem (vm_page_t);
-extern spl_t splhigh (void);
-extern spl_t splx (spl_t);
-extern void linux_soft_intr (void);
-extern int issig (void);
-extern int printf (const char *, ...);
-extern int linux_auto_config;
-
 static void timer_bh (void);
 
 DECLARE_TASK_QUEUE (tq_timer);
@@ -165,7 +160,7 @@ __do_down (struct semaphore *sem, int ta
 
 	  if (task_state == TASK_INTERRUPTIBLE && issig ())
 	    {
-	      ret = -LINUX_EINTR;
+	      ret = -EINTR;
 	      atomic_inc (&sem->count);
 	      break;
 	    }
@@ -185,7 +180,7 @@ __do_down (struct semaphore *sem, int ta
     {
       if (task_state == TASK_INTERRUPTIBLE && issig ())
 	{
-	  ret = -LINUX_EINTR;
+	  ret = -EINTR;
 	  atomic_inc (&sem->count);
 	  break;
 	}
@@ -326,16 +321,6 @@ schedule (void)
 }
 
 void
-cdrom_sleep (int t)
-{
-  int xxx;
-
-  assert_wait ((event_t) &xxx, TRUE);
-  thread_set_timeout (t);
-  schedule ();
-}
-
-void
 linux_sched_init (void)
 {
   /*