From cc05f21700c093d1f5ca118df672b014474d6c0a Mon Sep 17 00:00:00 2001
From: kstailey <kstailey@cvs.openbsd.org>
Date: Sat, 23 Nov 1996 23:19:55 +0000
Subject: remrq -> remrunqueue

---
 sys/arch/alpha/alpha/machdep.c     |  8 ++++----
 sys/arch/amiga/amiga/Locore.c      |  4 ++--
 sys/arch/amiga/amiga/locore.s      |  6 +++---
 sys/arch/arc/arc/locore.S          | 10 +++++-----
 sys/arch/arm32/arm32/cpuswitch.S   |  6 +++---
 sys/arch/atari/atari/Locore.c      |  2 +-
 sys/arch/atari/atari/locore.s      |  4 ++--
 sys/arch/hp300/hp300/Locore.c      |  2 +-
 sys/arch/hp300/hp300/locore.s      |  4 ++--
 sys/arch/i386/i386/locore.s        |  6 +++---
 sys/arch/mac68k/mac68k/locore.s    |  6 +++---
 sys/arch/mvme68k/mvme68k/locore.s  |  6 +++---
 sys/arch/mvme88k/mvme88k/locore2.c |  6 +++---
 sys/arch/pc532/pc532/locore.s      |  6 +++---
 sys/arch/pmax/pmax/locore.S        |  6 +++---
 sys/arch/sparc/sparc/locore2.c     |  4 ++--
 sys/arch/vax/vax/vm_machdep.c      |  4 ++--
 sys/kern/kern_synch.c              |  4 ++--
 sys/kern/spec_vnops.c              |  4 ++--
 sys/miscfs/specfs/spec_vnops.c     |  4 ++--
 sys/vm/vm_glue.c                   |  4 ++--
 21 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 075966bd54d..d05b89064b8 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.11 1996/10/30 22:38:14 niklas Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.12 1996/11/23 23:19:23 kstailey Exp $	*/
 /*	$NetBSD: machdep.c,v 1.49 1996/10/18 20:35:23 cgd Exp $	*/
 
 /*
@@ -1597,19 +1597,19 @@ setrunqueue(p)
 }
 
 /*
- * Remrq(p)
+ * Remrunqueue(p)
  *
  * Call should be made at splclock().
  */
 void
-remrq(p)
+remrunqueue(p)
 	struct proc *p;
 {
 	int bit;
 
 	bit = p->p_priority >> 2;
 	if ((whichqs & (1 << bit)) == 0)
-		panic("remrq");
+		panic("remrunqueue");
 
 	p->p_back->p_forw = p->p_forw;
 	p->p_forw->p_back = p->p_back;
diff --git a/sys/arch/amiga/amiga/Locore.c b/sys/arch/amiga/amiga/Locore.c
index d1edbb3d819..b1b0fdf7b68 100644
--- a/sys/arch/amiga/amiga/Locore.c
+++ b/sys/arch/amiga/amiga/Locore.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: Locore.c,v 1.2 1996/06/04 12:49:11 niklas Exp $	*/
+/*	$OpenBSD: Locore.c,v 1.3 1996/11/23 23:19:26 kstailey Exp $	*/
 /*	$NetBSD: Locore.c,v 1.11 1995/08/13 00:05:05 mycroft Exp $	*/
 
 /*
@@ -227,7 +227,7 @@ savectx(pcbp) struct pcb *pcbp; { return (0); }
 setrunqueue(p) struct proc *p; { }
 
 /*ARGSUSED*/
-remrq(p) struct proc *p; { }
+remrunqueue(p) struct proc *p; { }
 
 swtch() { if (whichqs) whichqs = 0; }
 
diff --git a/sys/arch/amiga/amiga/locore.s b/sys/arch/amiga/amiga/locore.s
index 605198d5808..460b049e509 100644
--- a/sys/arch/amiga/amiga/locore.s
+++ b/sys/arch/amiga/amiga/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.11 1996/08/19 00:04:14 niklas Exp $	*/
+/*	$OpenBSD: locore.s,v 1.12 1996/11/23 23:19:27 kstailey Exp $	*/
 /*	$NetBSD: locore.s,v 1.56.2.2 1996/06/14 11:20:45 is Exp $	*/
 
 /*
@@ -1278,7 +1278,7 @@ Lset2:
  *
  * Call should be made at spl6().
  */
-ENTRY(remrq)
+ENTRY(remrunqueue)
 	movl	sp@(4),a0
 	clrl	d0
 	movb	a0@(P_PRIORITY),d0
@@ -1308,7 +1308,7 @@ Lrem2:
 	rts
 
 Lrem3:
-	.asciz	"remrq"
+	.asciz	"remrunqueue"
 Lsw0:
 	.asciz	"cpu_switch"
 	.even
diff --git a/sys/arch/arc/arc/locore.S b/sys/arch/arc/arc/locore.S
index 3fff8eafe83..8b65b133982 100644
--- a/sys/arch/arc/arc/locore.S
+++ b/sys/arch/arc/arc/locore.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.S,v 1.6 1996/09/22 11:29:52 pefo Exp $	*/
+/*	$OpenBSD: locore.S,v 1.7 1996/11/23 23:19:29 kstailey Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -50,7 +50,7 @@
  *	v 1.1 89/07/10 14:27:41 nelson Exp  SPRITE (DECWRL)
  *
  *	from: @(#)locore.s	8.5 (Berkeley) 1/4/94
- *	$Id: locore.S,v 1.6 1996/09/22 11:29:52 pefo Exp $
+ *	$Id: locore.S,v 1.7 1996/11/23 23:19:29 kstailey Exp $
  */
 
 /*
@@ -573,7 +573,7 @@ END(setrunqueue)
  *
  * Call should be made at splclock().
  */
-NON_LEAF(remrq, STAND_FRAME_SIZE, ra)
+NON_LEAF(remrunqueue, STAND_FRAME_SIZE, ra)
 	subu	sp, sp, STAND_FRAME_SIZE
 	.mask	0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE)
 	lbu	t0, P_PRIORITY(a0)	# get from p->p_priority / 4 queue
@@ -585,7 +585,7 @@ NON_LEAF(remrq, STAND_FRAME_SIZE, ra)
 	sw	ra, STAND_RA_OFFSET(sp)	##
 	bne	v0, zero, 1f		##
 	lw	v0, P_BACK(a0)		# v0 = p->p_back
-	PANIC("remrq")			## it wasnt recorded to be on its q
+	PANIC("remrunqueue")		## it wasnt recorded to be on its q
 1:
 	lw	v1, P_FORW(a0)		# v1 = p->p_forw
 	nop
@@ -604,7 +604,7 @@ NON_LEAF(remrq, STAND_FRAME_SIZE, ra)
 	sw	zero, P_BACK(a0)	## for firewall checking
 	j	ra
 	addu	sp, sp, STAND_FRAME_SIZE
-END(remrq)
+END(remrunqueue)
 
 /*
  * switch_exit()
diff --git a/sys/arch/arm32/arm32/cpuswitch.S b/sys/arch/arm32/arm32/cpuswitch.S
index e40d6c5a643..6dba0964093 100644
--- a/sys/arch/arm32/arm32/cpuswitch.S
+++ b/sys/arch/arm32/arm32/cpuswitch.S
@@ -66,7 +66,7 @@ pc	.req	r15
  	ldr	lr, [sp], #0x0004;	/* Pull the return address */
 
 /*
- * setrunqueue() and remrq()
+ * setrunqueue() and remrunqueue()
  *
  * Functions to add and remove a process for the run queue.
  */
@@ -165,8 +165,8 @@ Ltext2:
  *	r0 = process
  */
 
-	.global	_remrq
-_remrq:
+	.global	_remrunqueue
+_remrunqueue:
 
 /*
  * Local register usage
diff --git a/sys/arch/atari/atari/Locore.c b/sys/arch/atari/atari/Locore.c
index 85bef64cb1d..b83dfc67c80 100644
--- a/sys/arch/atari/atari/Locore.c
+++ b/sys/arch/atari/atari/Locore.c
@@ -226,7 +226,7 @@ savectx(pcbp) struct pcb *pcbp; { return (0); }
 setrunqueue(p) struct proc *p; { }
 
 /*ARGSUSED*/
-remrq(p) struct proc *p; { }
+remrunqueue(p) struct proc *p; { }
 
 swtch() { if (whichqs) whichqs = 0; }
 
diff --git a/sys/arch/atari/atari/locore.s b/sys/arch/atari/atari/locore.s
index 5a012e68d2e..128db4ee718 100644
--- a/sys/arch/atari/atari/locore.s
+++ b/sys/arch/atari/atari/locore.s
@@ -1088,7 +1088,7 @@ Lset2:
  *
  * Call should be made at spl6().
  */
-ENTRY(remrq)
+ENTRY(remrunqueue)
 	movl	sp@(4),a0
 	clrl	d0
 	movb	a0@(P_PRIORITY),d0
@@ -1118,7 +1118,7 @@ Lrem2:
 	rts
 
 Lrem3:
-	.asciz	"remrq"
+	.asciz	"remrunqueue"
 Lsw0:
 	.asciz	"cpu_switch"
 	.even
diff --git a/sys/arch/hp300/hp300/Locore.c b/sys/arch/hp300/hp300/Locore.c
index 6a991ce0b30..eb429bfa1f8 100644
--- a/sys/arch/hp300/hp300/Locore.c
+++ b/sys/arch/hp300/hp300/Locore.c
@@ -226,7 +226,7 @@ savectx(pcbp) struct pcb *pcbp; { return (0); }
 setrunqueue(p) struct proc *p; { }
 
 /*ARGSUSED*/
-remrq(p) struct proc *p; { }
+remrunqueue(p) struct proc *p; { }
 
 swtch() { if (whichqs) whichqs = 0; }
 
diff --git a/sys/arch/hp300/hp300/locore.s b/sys/arch/hp300/hp300/locore.s
index b6017a15ba0..0b0fcfab7c7 100644
--- a/sys/arch/hp300/hp300/locore.s
+++ b/sys/arch/hp300/hp300/locore.s
@@ -1123,7 +1123,7 @@ Lset2:
  *
  * Call should be made at spl6().
  */
-ENTRY(remrq)
+ENTRY(remrunqueue)
 	movl	sp@(4),a0
 	movb	a0@(P_PRIORITY),d0
 #ifdef DIAGNOSTIC
@@ -1152,7 +1152,7 @@ Lrem2:
 	movl	#Lrem3,sp@-
 	jbsr	_panic
 Lrem3:
-	.asciz	"remrq"
+	.asciz	"remrunqueue"
 	.even
 #endif
 
diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s
index e613fc95989..a452254f62b 100644
--- a/sys/arch/i386/i386/locore.s
+++ b/sys/arch/i386/i386/locore.s
@@ -1600,10 +1600,10 @@ ENTRY(setrunqueue)
 #endif /* DIAGNOSTIC */
 
 /*
- * remrq(struct proc *p);
+ * remrunqueue(struct proc *p);
  * Remove a process from its queue.  Should be called at splclock().
  */
-ENTRY(remrq)
+ENTRY(remrunqueue)
 	movl	4(%esp),%ecx
 	movzbl	P_PRIORITY(%ecx),%eax
 #ifdef DIAGNOSTIC
@@ -1627,7 +1627,7 @@ ENTRY(remrq)
 1:	pushl	$3f
 	call	_panic
 	/* NOTREACHED */
-3:	.asciz	"remrq"
+3:	.asciz	"remrunqueue"
 #endif /* DIAGNOSTIC */
 
 #if NAPM > 0
diff --git a/sys/arch/mac68k/mac68k/locore.s b/sys/arch/mac68k/mac68k/locore.s
index 670d07d1144..53954710b01 100644
--- a/sys/arch/mac68k/mac68k/locore.s
+++ b/sys/arch/mac68k/mac68k/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.14 1996/10/23 04:49:47 briggs Exp $	*/
+/*	$OpenBSD: locore.s,v 1.15 1996/11/23 23:19:38 kstailey Exp $	*/
 /*	$NetBSD: locore.s,v 1.70 1996/10/17 06:32:13 scottr Exp $	*/
 
 /*
@@ -1199,7 +1199,7 @@ Lset2:
  *
  * Call should be made at spl6().
  */
-ENTRY(remrq)
+ENTRY(remrunqueue)
 	movl	sp@(4),a0		| proc *p
 	movb	a0@(P_PRIORITY),d0	| d0 = processes priority
 #ifdef DIAGNOSTIC
@@ -1229,7 +1229,7 @@ Lrem2:
 	movl	#Lrem3,sp@-
 	jbsr	_panic
 Lrem3:
-	.asciz	"remrq"
+	.asciz	"remrunqueue"
 	.even
 #endif
 
diff --git a/sys/arch/mvme68k/mvme68k/locore.s b/sys/arch/mvme68k/mvme68k/locore.s
index c4eeb0bf28e..7f44ef68d2d 100644
--- a/sys/arch/mvme68k/mvme68k/locore.s
+++ b/sys/arch/mvme68k/mvme68k/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.9 1996/06/16 00:53:45 deraadt Exp $ */
+/*	$OpenBSD: locore.s,v 1.10 1996/11/23 23:19:41 kstailey Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -1223,7 +1223,7 @@ Lset2:
  *
  * Call should be made at spl6().
  */
-ENTRY(remrq)
+ENTRY(remrunqueue)
 	movl	sp@(4),a0
 	movb	a0@(P_PRIORITY),d0
 #ifdef DIAGNOSTIC
@@ -1252,7 +1252,7 @@ Lrem2:
 	movl	#Lrem3,sp@-
 	jbsr	_panic
 Lrem3:
-	.asciz	"remrq"
+	.asciz	"remrunqueue"
 	.even
 #endif
 
diff --git a/sys/arch/mvme88k/mvme88k/locore2.c b/sys/arch/mvme88k/mvme88k/locore2.c
index f5800508126..d1b72d698a3 100644
--- a/sys/arch/mvme88k/mvme88k/locore2.c
+++ b/sys/arch/mvme88k/mvme88k/locore2.c
@@ -42,7 +42,7 @@
  *	@(#)locore2.c	8.4 (Berkeley) 12/10/93
  *
  * from: Header: locore2.c,v 1.8 92/11/26 03:05:01 mccanne Exp (LBL)
- * $Id: locore2.c,v 1.1 1995/10/18 12:32:24 deraadt Exp $
+ * $Id: locore2.c,v 1.2 1996/11/23 23:19:43 kstailey Exp $
  */
 
 /*
@@ -82,14 +82,14 @@ setrunqueue(p)
  * Remove process p from its run queue, which should be the one
  * indicated by its priority.  Calls should be made at splstatclock().
  */
-remrq(p)
+remrunqueue(p)
 	register struct proc *p;
 {
 	register int which = p->p_priority >> 2;
 	register struct prochd *q;
 
 	if ((whichqs & (1 << which)) == 0)
-		panic("remrq");
+		panic("remrunqueue");
 	p->p_forw->p_back = p->p_back;
 	p->p_back->p_forw = p->p_forw;
 	p->p_back = NULL;
diff --git a/sys/arch/pc532/pc532/locore.s b/sys/arch/pc532/pc532/locore.s
index 2862bf29997..71bb6a36570 100644
--- a/sys/arch/pc532/pc532/locore.s
+++ b/sys/arch/pc532/pc532/locore.s
@@ -584,10 +584,10 @@ ENTRY(setrunqueue)
 2:	.asciz "setrunqueue problem!"
 
 /*
- * remrq(struct proc *p);
+ * remrunqueue(struct proc *p);
  * Remove a process from its queue.  Should be called at splclock().
  */
-ENTRY(remrq)
+ENTRY(remrunqueue)
 	movd	S_ARG0, r1
 	movd	r2, tos
 	movzbd	P_PRIORITY(r1), r0
@@ -611,7 +611,7 @@ ENTRY(remrq)
 
 1:	addr	2f(pc),tos		/* No queue entry! */
 	bsr	_panic	
-2:	.asciz "remrq problem!"
+2:	.asciz "remrunqueue problem!"
 
 /* Switch to another process from kernel code...  */
 
diff --git a/sys/arch/pmax/pmax/locore.S b/sys/arch/pmax/pmax/locore.S
index f6b110c9151..d77c118d114 100644
--- a/sys/arch/pmax/pmax/locore.S
+++ b/sys/arch/pmax/pmax/locore.S
@@ -550,7 +550,7 @@ END(setrunqueue)
  *
  * Call should be made at splclock().
  */
-NON_LEAF(remrq, STAND_FRAME_SIZE, ra)
+NON_LEAF(remrunqueue, STAND_FRAME_SIZE, ra)
 	subu	sp, sp, STAND_FRAME_SIZE
 	.mask	0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE)
 	lbu	t0, P_PRIORITY(a0)	# get from p->p_priority / 4 queue
@@ -562,7 +562,7 @@ NON_LEAF(remrq, STAND_FRAME_SIZE, ra)
 	sw	ra, STAND_RA_OFFSET(sp)	##
 	bne	v0, zero, 1f		##
 	lw	v0, P_BACK(a0)		# v0 = p->p_back
-	PANIC("remrq")			## it wasnt recorded to be on its q
+	PANIC("remrunqueue")			## it wasnt recorded to be on its q
 1:
 	lw	v1, P_FORW(a0)		# v1 = p->p_forw
 	nop
@@ -581,7 +581,7 @@ NON_LEAF(remrq, STAND_FRAME_SIZE, ra)
 	sw	zero, P_BACK(a0)	## for firewall checking
 	j	ra
 	addu	sp, sp, STAND_FRAME_SIZE
-END(remrq)
+END(remrunqueue)
 
 /*
  * switch_exit()
diff --git a/sys/arch/sparc/sparc/locore2.c b/sys/arch/sparc/sparc/locore2.c
index c44c604b200..7e28fb8f265 100644
--- a/sys/arch/sparc/sparc/locore2.c
+++ b/sys/arch/sparc/sparc/locore2.c
@@ -85,14 +85,14 @@ setrunqueue(p)
  * indicated by its priority.  Calls should be made at splstatclock().
  */
 void
-remrq(p)
+remrunqueue(p)
 	register struct proc *p;
 {
 	register int which = p->p_priority >> 2;
 	register struct prochd *q;
 
 	if ((whichqs & (1 << which)) == 0)
-		panic("remrq");
+		panic("remrunqueue");
 	p->p_forw->p_back = p->p_back;
 	p->p_back->p_forw = p->p_forw;
 	p->p_back = NULL;
diff --git a/sys/arch/vax/vax/vm_machdep.c b/sys/arch/vax/vax/vm_machdep.c
index 04e20a0e1cb..60a486bc405 100644
--- a/sys/arch/vax/vax/vm_machdep.c
+++ b/sys/arch/vax/vax/vm_machdep.c
@@ -211,7 +211,7 @@ setrunqueue(p)
  * on that queue, clear the queue bit in whichqs.
  */
 void
-remrq(p)
+remrunqueue(p)
 	struct proc *p;
 {
 	struct	proc *qp;
@@ -219,7 +219,7 @@ remrq(p)
 
 	bitnr = (p->p_priority >> 2);
 	if (bitisclear(bitnr, whichqs))
-		panic("remrq: Process not in queue");
+		panic("remrunqueue: Process not in queue");
 
 	_remque(p);
 
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 071156d5f7e..b2bd1006c11 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_synch.c,v 1.4 1996/05/02 13:12:15 deraadt Exp $	*/
+/*	$OpenBSD: kern_synch.c,v 1.5 1996/11/23 23:19:51 kstailey Exp $	*/
 /*	$NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $	*/
 
 /*-
@@ -214,7 +214,7 @@ schedcpu(arg)
 			    p->p_stat == SRUN &&
 			    (p->p_flag & P_INMEM) &&
 			    (p->p_priority / PPQ) != (p->p_usrpri / PPQ)) {
-				remrq(p);
+				remrunqueue(p);
 				p->p_priority = p->p_usrpri;
 				setrunqueue(p);
 			} else
diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c
index d68f6ab39f9..62cecd13c8e 100644
--- a/sys/kern/spec_vnops.c
+++ b/sys/kern/spec_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spec_vnops.c,v 1.5 1996/11/23 21:47:11 kstailey Exp $	*/
+/*	$OpenBSD: spec_vnops.c,v 1.6 1996/11/23 23:19:52 kstailey Exp $	*/
 /*	$NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $	*/
 
 /*
@@ -707,7 +707,7 @@ int
 spec_advlock(v)
 	void *v;
 {
-#ifdef NFSSERVER
+#ifdef UFS
 	extern int ufs_advlock __P((void *v));
 
 	return (ufs_advlock(v));
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index d68f6ab39f9..62cecd13c8e 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spec_vnops.c,v 1.5 1996/11/23 21:47:11 kstailey Exp $	*/
+/*	$OpenBSD: spec_vnops.c,v 1.6 1996/11/23 23:19:52 kstailey Exp $	*/
 /*	$NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $	*/
 
 /*
@@ -707,7 +707,7 @@ int
 spec_advlock(v)
 	void *v;
 {
-#ifdef NFSSERVER
+#ifdef UFS
 	extern int ufs_advlock __P((void *v));
 
 	return (ufs_advlock(v));
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 47c723dcd33..764435ddc34 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_glue.c,v 1.20 1996/08/02 00:05:59 niklas Exp $    */
+/*	$OpenBSD: vm_glue.c,v 1.21 1996/11/23 23:19:54 kstailey Exp $    */
 /*	$NetBSD: vm_glue.c,v 1.55.4.1 1996/06/13 17:25:45 cgd Exp $	*/
 
 /* 
@@ -543,7 +543,7 @@ swapout(p)
 	s = splstatclock();
 	p->p_flag &= ~P_INMEM;
 	if (p->p_stat == SRUN)
-		remrq(p);
+		remrunqueue(p);
 	splx(s);
 	p->p_swtime = 0;
 	++cnt.v_swpout;
-- 
cgit v1.2.3