projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
function results (void)'ed for minor lint
[unix-history]
/
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
99fd57f
..
fb60ea1
100644
(file)
--- a/
usr/src/sys/kern/kern_synch.c
+++ b/
usr/src/sys/kern/kern_synch.c
@@
-1,4
+1,4
@@
-/* kern_synch.c
3.12
%G% */
+/* kern_synch.c
4.2
%G% */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
@@
-259,7
+259,7
@@
register struct proc *pp;
register p;
p = (pp->p_cpu & 0377)/16;
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)
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;
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;
if (isvfork) {
rpp->p_flag |= SVFORK;
rpp->p_ndx = rip->p_ndx;
@@
-342,8
+342,8
@@
retry:
rpp->p_rssize = 0;
rpp->p_wchan = 0;
rpp->p_slptime = 0;
rpp->p_rssize = 0;
rpp->p_wchan = 0;
rpp->p_slptime = 0;
- rpp->p_
aveflt = rip->p_aveflt
;
- rpp->p_
fault
s = 0;
+ rpp->p_
pctcpu = 0
;
+ rpp->p_
cptick
s = 0;
n = PIDHASH(rpp->p_pid);
p->p_idhash = pidhash[n];
pidhash[n] = rpp - proc;
n = PIDHASH(rpp->p_pid);
p->p_idhash = pidhash[n];
pidhash[n] = rpp - proc;
@@
-376,7
+376,7
@@
retry:
if (procdup(rpp, isvfork))
return (1);
if (procdup(rpp, isvfork))
return (1);
- spl6();
+
(void)
spl6();
rpp->p_stat = SRUN;
setrq(rpp);
spl0();
rpp->p_stat = SRUN;
setrq(rpp);
spl0();