X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/eb83bf86a0eaf06f2adc62c19321650f48ecc87c..f4c13170101fd0eb5e60b14d3d74b3b34cba690c:/usr/src/sys/kern/kern_proc.c

diff --git a/usr/src/sys/kern/kern_proc.c b/usr/src/sys/kern/kern_proc.c
index 4497220bc6..920b9f77dc 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.5	%G%	*/
+/*	kern_proc.c	4.8	%G%	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -169,12 +169,12 @@ exece()
 	ne = 0;
 	nc = 0;
 	uap = (struct execa *)u.u_ap;
-	if ((bno = malloc(argmap, ctod(clrnd((int) btoc(NCARGS))))) == 0) {
+	if ((bno = rmalloc(argmap, ctod(clrnd((int) btoc(NCARGS))))) == 0) {
 		swkill(u.u_procp, "exece");
 		goto bad;
 	}
 	if (bno % CLSIZE)
-		panic("execa malloc");
+		panic("execa rmalloc");
 	if (uap->argp) for (;;) {
 		ap = NULL;
 		if (na == 1 && indir) {
@@ -280,7 +280,7 @@ bad:
 	if (bp)
 		brelse(bp);
 	if (bno)
-		mfree(argmap, ctod(clrnd((int) btoc(NCARGS))), bno);
+		rmfree(argmap, ctod(clrnd((int) btoc(NCARGS))), bno);
 	iput(ip);
 }
 
@@ -301,7 +301,7 @@ register struct inode *ip;
 	if(u.u_exdata.ux_tsize!=0 && (ip->i_flag&ITEXT)==0 && ip->i_count!=1) {
 		register struct file *fp;
 
-		for (fp = file; fp < &file[NFILE]; fp++)
+		for (fp = file; fp < fileNFILE; fp++)
 			if (fp->f_inode == ip && (fp->f_flag&FWRITE)) {
 				u.u_error = ETXTBSY;
 				goto bad;
@@ -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);