X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/6fdc0335d54b44dd031b57c3036997ad97240867..934e4ecf9018991ee10ed5a0a6116db88acb7c42:/usr/src/sys/kern/kern_synch.c

diff --git a/usr/src/sys/kern/kern_synch.c b/usr/src/sys/kern/kern_synch.c
index 966679134a..fb60ea1a45 100644
--- a/usr/src/sys/kern/kern_synch.c
+++ b/usr/src/sys/kern/kern_synch.c
@@ -1,4 +1,4 @@
-/*	kern_synch.c	3.10	%H%	*/
+/*	kern_synch.c	4.2	%G%	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -259,7 +259,7 @@ register struct proc *pp;
 	register p;
 
 	p = (pp->p_cpu & 0377)/16;
-	p += PUSER + pp->p_nice - NZERO;
+	p += PUSER + 2*(pp->p_nice - NZERO);
 	if(p > 127)
 		p = 127;
 	if(p < curpri)
@@ -308,7 +308,7 @@ retry:
 	rip = u.u_procp;
 	rpp->p_stat = SIDL;
 	rpp->p_clktim = 0;
-	rpp->p_flag = SLOAD | (rip->p_flag & SPAGI);
+	rpp->p_flag = SLOAD | (rip->p_flag & (SPAGI|SDETACH|SNUSIG));
 	if (isvfork) {
 		rpp->p_flag |= SVFORK;
 		rpp->p_ndx = rip->p_ndx;
@@ -342,9 +342,8 @@ retry:
 	rpp->p_rssize = 0;
 	rpp->p_wchan = 0;
 	rpp->p_slptime = 0;
-	rpp->p_aveflt = rip->p_aveflt;
-	rate.v_pgin += rip->p_aveflt;
-	rpp->p_faults = 0;
+	rpp->p_pctcpu = 0;
+	rpp->p_cpticks = 0;
 	n = PIDHASH(rpp->p_pid);
 	p->p_idhash = pidhash[n];
 	pidhash[n] = rpp - proc;
@@ -377,7 +376,7 @@ retry:
 	if (procdup(rpp, isvfork))
 		return (1);
 
-	spl6();
+	(void) spl6();
 	rpp->p_stat = SRUN;
 	setrq(rpp);
 	spl0();