From 86fd527faf688ed6074d754c09bc9a2f2801d067 Mon Sep 17 00:00:00 2001
From: Bill Joy <wnj@ucbvax.Berkeley.EDU>
Date: Fri, 27 Feb 1981 07:40:27 -0800
Subject: [PATCH] rid of NPROC

SCCS-vsn: sys/kern/kern_clock.c 4.12
SCCS-vsn: sys/kern/kern_synch.c 4.8
SCCS-vsn: sys/kern/kern_proc.c 4.7
SCCS-vsn: sys/vm/vm_meter.c 4.2
---
 usr/src/sys/kern/kern_clock.c |  4 ++--
 usr/src/sys/kern/kern_proc.c  | 10 +++++-----
 usr/src/sys/kern/kern_synch.c |  4 ++--
 usr/src/sys/vm/vm_meter.c     |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/usr/src/sys/kern/kern_clock.c b/usr/src/sys/kern/kern_clock.c
index 4083b12467..ce5d6b7813 100644
--- a/usr/src/sys/kern/kern_clock.c
+++ b/usr/src/sys/kern/kern_clock.c
@@ -1,4 +1,4 @@
-/*	kern_clock.c	4.11	%G%	*/
+/*	kern_clock.c	4.12	%G%	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -206,7 +206,7 @@ softclock(pc, ps)
 		lbolt -= HZ;
 		++time;
 		wakeup((caddr_t)&lbolt);
-		for(pp = &proc[0]; pp < &proc[NPROC]; pp++)
+		for(pp = proc; pp < procNPROC; pp++)
 		if (pp->p_stat && pp->p_stat!=SZOMB) {
 			if(pp->p_time != 127)
 				pp->p_time++;
diff --git a/usr/src/sys/kern/kern_proc.c b/usr/src/sys/kern/kern_proc.c
index b49b65de73..06600e05b3 100644
--- a/usr/src/sys/kern/kern_proc.c
+++ b/usr/src/sys/kern/kern_proc.c
@@ -1,4 +1,4 @@
-/*	kern_proc.c	4.6	%G%	*/
+/*	kern_proc.c	4.7	%G%	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -575,7 +575,7 @@ done:
 	((struct xproc *)p)->xp_xstat = rv;		/* overlay */
 	((struct xproc *)p)->xp_vm = u.u_vm;		/* overlay */
 	vmsadd(&((struct xproc *)p)->xp_vm, &u.u_cvm);
-	for(q = &proc[0]; q < &proc[NPROC]; q++)
+	for(q = proc; q < procNPROC; q++)
 		if(q->p_pptr == p) {
 			q->p_pptr = &proc[1];
 			q->p_ppid = 1;
@@ -639,7 +639,7 @@ wait1(options, vp)
 
 	f = 0;
 loop:
-	for(p = &proc[0]; p < &proc[NPROC]; p++)
+	for(p = proc; p < procNPROC; p++)
 	if(p->p_pptr == u.u_procp) {
 		f++;
 		if(p->p_stat == SZOMB) {
@@ -709,7 +709,7 @@ fork1(isvfork)
 
 	a = 0;
 	p2 = NULL;
-	for(p1 = &proc[0]; p1 < &proc[NPROC]; p1++) {
+	for(p1 = proc; p1 < procNPROC; p1++) {
 		if (p1->p_stat==NULL && p2==NULL)
 			p2 = p1;
 		else {
@@ -723,7 +723,7 @@ fork1(isvfork)
 	 *  not su and too many procs owned; or
 	 *  not su and would take last slot.
 	 */
-	if (p2==NULL || (u.u_uid!=0 && (p2==&proc[NPROC-1] || a>MAXUPRC))) {
+	if (p2==NULL || (u.u_uid!=0 && (p2==procNPROC-1 || a>MAXUPRC))) {
 		u.u_error = EAGAIN;
 		if (!isvfork) {
 			(void) vsexpand(0, &u.u_cdmap, 1);
diff --git a/usr/src/sys/kern/kern_synch.c b/usr/src/sys/kern/kern_synch.c
index 24e15f3c19..b7c6516890 100644
--- a/usr/src/sys/kern/kern_synch.c
+++ b/usr/src/sys/kern/kern_synch.c
@@ -1,4 +1,4 @@
-/*	kern_synch.c	4.7	%G%	*/
+/*	kern_synch.c	4.8	%G%	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -286,7 +286,7 @@ retry:
 		mpid = 0;
 		goto retry;
 	}
-	for(rpp = &proc[0]; rpp < &proc[NPROC]; rpp++) {
+	for(rpp = proc; rpp < procNPROC; rpp++) {
 		if(rpp->p_stat == NULL && p==NULL)
 			p = rpp;
 		if (rpp->p_pid==mpid || rpp->p_pgrp==mpid)
diff --git a/usr/src/sys/vm/vm_meter.c b/usr/src/sys/vm/vm_meter.c
index 265f98ccea..dce8c8e880 100644
--- a/usr/src/sys/vm/vm_meter.c
+++ b/usr/src/sys/vm/vm_meter.c
@@ -1,4 +1,4 @@
-/*	vm_meter.c	4.1	%G%	*/
+/*	vm_meter.c	4.2	%G%	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -96,7 +96,7 @@ loop:
 	 * look for someone who deserves to be brought in.
 	 */
 	outpri = -20000;
-	for (rp = &proc[0]; rp < &proc[NPROC]; rp++) switch(rp->p_stat) {
+	for (rp = proc; rp < procNPROC; rp++) switch(rp->p_stat) {
 
 	case SRUN:
 		if ((rp->p_flag&SLOAD) == 0) {
@@ -180,7 +180,7 @@ hardswap:
 		nbig = 1;
 	biggot = 0;
 	bplist.bp_link = 0;
-	for (rp = &proc[0]; rp < &proc[NPROC]; rp++) {
+	for (rp = proc; rp < procNPROC; rp++) {
 		if (!swappable(rp))
 			continue;
 		if (rp->p_stat==SZOMB)
@@ -365,7 +365,7 @@ next:
 	total.t_pw = 0;
 	total.t_sl = 0;
 	total.t_sw = 0;
-	for (p = &proc[0]; p < &proc[NPROC]; p++) {
+	for (p = proc; p < procNPROC; p++) {
 		if (p->p_flag & SSYS)
 			continue;
 		if (p->p_stat) {
-- 
2.20.1