--- Gnu-Mach/kern/ast.c	2020/09/02 04:36:57	1.1.1.1
+++ Gnu-Mach/kern/ast.c	2020/09/02 04:49:51	1.1.1.5
@@ -35,44 +35,42 @@
  *
  */
 
-#include <cpus.h>
-#include <mach_fixpri.h>
-#include <norma_ipc.h>
-
 #include <kern/ast.h>
 #include <kern/counters.h>
+#include <kern/debug.h>
 #include "cpu_number.h"
 #include <kern/queue.h>
 #include <kern/sched.h>
 #include <kern/sched_prim.h>
 #include <kern/thread.h>
 #include <kern/processor.h>
+#include <device/net_io.h>
 
 #include <machine/machspl.h>	/* for splsched */
 
 #if	MACH_FIXPRI
 #include <mach/policy.h>
-#endif	MACH_FIXPRI
+#endif	/* MACH_FIXPRI */
 
 
 volatile ast_t need_ast[NCPUS];
 
 void
-ast_init()
+ast_init(void)
 {
 #ifndef	MACHINE_AST
-	register int i;
+	int i;
 
 	for (i=0; i<NCPUS; i++)
 		need_ast[i] = 0;
-#endif	MACHINE_AST
+#endif	/* MACHINE_AST */
 }
 
 void
-ast_taken()
+ast_taken(void)
 {
-	register thread_t self = current_thread();
-	register ast_t reasons;
+	thread_t self = current_thread();
+	ast_t reasons;
 
 	/*
 	 *	Interrupts are still disabled.
@@ -90,11 +88,6 @@ ast_taken()
 	if (reasons & AST_NETWORK)
 		net_ast();
 
-#if	NORMA_IPC
-	if (reasons & AST_NETIPC)
-		netipc_ast();
-#endif	NORMA_IPC
-
 	/*
 	 *	Make darn sure that we don't call thread_halt_self
 	 *	or thread_block from the idle thread.
@@ -103,7 +96,7 @@ ast_taken()
 	if (self != current_processor()->idle_thread) {
 #ifndef MIGRATING_THREADS
 		while (thread_should_halt(self))
-			thread_halt_self();
+			thread_halt_self(thread_exception_return);
 #endif
 
 		/*
@@ -121,12 +114,12 @@ ast_taken()
 }
 
 void
-ast_check()
+ast_check(void)
 {
-	register int		mycpu = cpu_number();
-	register processor_t	myprocessor;
-	register thread_t	thread = current_thread();
-	register run_queue_t	rq;
+	int			mycpu = cpu_number();
+	processor_t		myprocessor;
+	thread_t		thread = current_thread();
+	run_queue_t		rq;
 	spl_t			s = splsched();
 
 	/*
@@ -152,7 +145,7 @@ ast_check()
 		 */
 		ast_on(mycpu, AST_BLOCK);
 		break;
-#endif	NCPUS > 1
+#endif	/* NCPUS > 1 */
 
 	    case PROCESSOR_RUNNING:
 
@@ -194,10 +187,10 @@ ast_check()
 		    }
 		}
 		else {
-#endif	MACH_FIXPRI			
+#endif	/* MACH_FIXPRI			 */
 		rq = &(myprocessor->processor_set->runq);
 		if (!(myprocessor->first_quantum) && (rq->count > 0)) {
-		    register queue_t 	q;
+		    queue_t 		q;
 		    /*
 		     *	This is not the first quantum, and there may
 		     *	be something in the processor_set runq.
@@ -205,7 +198,7 @@ ast_check()
 		     */
 		    q = rq->runq + *(volatile int *)&rq->low;
 		    if (queue_empty(q)) {
-			register int i;
+			int i;
 
 			/*
 			 *	Need to recheck and possibly update hint.
@@ -230,7 +223,7 @@ ast_check()
 		}
 #if	MACH_FIXPRI
 		}
-#endif	MACH_FIXPRI
+#endif	/* MACH_FIXPRI */
 		break;
 
 	    default: