From c6abdc20541427f8cf6913c5c05e71c24850c42b Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Fri, 13 May 1994 00:50:41 +0000
Subject: [PATCH] setrq -> setrunqueue, sched -> scheduler

---
 sys/arch/i386/i386/locore.s |  8 ++++----
 sys/arch/i386/i386/trap.c   |  6 +++---
 sys/kern/init_main.c        |  2 +-
 sys/kern/kern_fork.c        |  2 +-
 sys/kern/kern_synch.c       |  2 +-
 sys/vm/vm_glue.c            | 12 ++++++------
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s
index 1f0bd5d1c78d..5e620acb66a2 100644
--- a/sys/arch/i386/i386/locore.s
+++ b/sys/arch/i386/i386/locore.s
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.66 1994/05/05 08:44:53 mycroft Exp $
+ *	$Id: locore.s,v 1.67 1994/05/13 00:50:41 cgd Exp $
  */
 
 /*
@@ -1385,10 +1385,10 @@ ENTRY(longjmp)
 	.globl	_whichqs,_qs,_cnt,_panic
 
 /*
- * setrq(struct proc *p);
+ * setrunqueue(struct proc *p);
  * Insert a process on the appropriate queue.  Should be called at splclock().
  */
-ENTRY(setrq)
+ENTRY(setrunqueue)
 	movl	4(%esp),%eax
 #ifdef DIAGNOSTIC
 	cmpl	$0,P_BACK(%eax)	# should not be on q already
@@ -1412,7 +1412,7 @@ ENTRY(setrq)
 1:	pushl	$2f
 	call	_panic
 	/*NOTREACHED*/
-2:	.asciz	"setrq"
+2:	.asciz	"setrunqueue"
 #endif
 
 /*
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c
index 6bd6f241d3a3..50464e5bb56f 100644
--- a/sys/arch/i386/i386/trap.c
+++ b/sys/arch/i386/i386/trap.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.39 1994/05/07 00:52:44 cgd Exp $
+ *	$Id: trap.c,v 1.40 1994/05/13 00:50:44 cgd Exp $
  */
 
 /*
@@ -91,12 +91,12 @@ userret(p, pc, oticks)
 		 * Since we are curproc, a clock interrupt could
 		 * change our priority without changing run queues
 		 * (the running process is not kept on a run queue).
-		 * If this happened after we setrq ourselves but
+		 * If this happened after we setrunqueue ourselves but
 		 * before we swtch()'ed, we might not be on the queue
 		 * indicated by our priority.
 		 */
 		(void) splclock();
-		setrq(p);
+		setrunqueue(p);
 		p->p_stats->p_ru.ru_nivcsw++;
 		swtch();
 		(void) spl0();
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index c07e0af8705f..35993fdcf656 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1 +1 @@
-revision 1.40 intentionally removed
+revision 1.41 intentionally removed
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index ea15b814f507..515824e99bf1 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1 +1 @@
-revision 1.14 intentionally removed
+revision 1.15 intentionally removed
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index a8860afbc711..312fc6115599 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -1 +1 @@
-revision 1.22 intentionally removed
+revision 1.23 intentionally removed
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 40ec6ae59584..e0609b1e2698 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -308,7 +308,7 @@ int	swapdebug = 0;
  *	   clear some space.
  */
 void
-sched()
+scheduler()
 {
 	register struct proc *p;
 	register int pri;
@@ -336,14 +336,14 @@ loop:
 		}
 #ifdef DEBUG
 	if (swapdebug & SDB_FOLLOW)
-		printf("sched: running, procp %x pri %d\n", pp, ppri);
+		printf("scheduler: running, procp %x pri %d\n", pp, ppri);
 noswap:
 #endif
 	/*
 	 * Nothing to do, back to sleep
 	 */
 	if ((p = pp) == NULL) {
-		tsleep((caddr_t)&proc0, PVM, "sched", 0);
+		tsleep((caddr_t)&proc0, PVM, "scheduler", 0);
 		goto loop;
 	}
 
@@ -364,7 +364,7 @@ noswap:
 		vm_map_pageable(kernel_map, addr, addr+size, FALSE);
 		(void) splclock();
 		if (p->p_stat == SRUN)
-			setrq(p);
+			setrunqueue(p);
 		p->p_flag |= P_INMEM;
 		(void) spl0();
 		p->p_swtime = 0;
@@ -376,7 +376,7 @@ noswap:
 	 */
 #ifdef DEBUG
 	if (swapdebug & SDB_FOLLOW)
-		printf("sched: no room for pid %d(%s), free %d\n",
+		printf("scheduler: no room for pid %d(%s), free %d\n",
 		       p->p_pid, p->p_comm, cnt.v_free_count);
 #endif
 	(void) splhigh();
@@ -384,7 +384,7 @@ noswap:
 	(void) spl0();
 #ifdef DEBUG
 	if (swapdebug & SDB_FOLLOW)
-		printf("sched: room again, free %d\n", cnt.v_free_count);
+		printf("scheduler: room again, free %d\n", cnt.v_free_count);
 #endif
 	goto loop;
 }