diff options
| author | dufault <dufault@FreeBSD.org> | 2000-03-02 22:03:49 +0000 |
|---|---|---|
| committer | dufault <dufault@FreeBSD.org> | 2000-03-02 22:03:49 +0000 |
| commit | 705c38904d4c33686f447d07bfe5790b88e319ef (patch) | |
| tree | 550f60c67b98e14ec2ad0f65f6d2693ced6ac243 /sys/kern/kern_synch.c | |
| parent | 2809faac72adeae047da4c05cc78cca99948ee40 (diff) | |
| download | FreeBSD-src-705c38904d4c33686f447d07bfe5790b88e319ef.zip FreeBSD-src-705c38904d4c33686f447d07bfe5790b88e319ef.tar.gz | |
I applied the wrong patch set. Back out anything associated
with the known bogus currtpriority. This undoes the previous changes to
sys/i386/i386/trap.c, sys/alpha/alpha/trap.c, sys/sys/systm.h
Now we have the patch set approved by bde.
Approved by: bde
Diffstat (limited to 'sys/kern/kern_synch.c')
| -rw-r--r-- | sys/kern/kern_synch.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 8d0a8ee..a590506 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -65,7 +65,6 @@ static void sched_setup __P((void *dummy)); SYSINIT(sched_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, sched_setup, NULL) u_char curpriority; -u_char currtpriority; int hogticks; int lbolt; int sched_quantum; /* Roundrobin scheduling quantum in ticks. */ @@ -112,15 +111,13 @@ curpriority_cmp(p) { int c_class, p_class; - if (curproc->p_rtprio.prio != currtpriority) - Debugger("currtprio"); c_class = RTP_PRIO_BASE(curproc->p_rtprio.type); p_class = RTP_PRIO_BASE(p->p_rtprio.type); if (p_class != c_class) return (p_class - c_class); if (p_class == RTP_PRIO_NORMAL) return (((int)p->p_priority - (int)curpriority) / PPQ); - return ((int)p->p_rtprio.prio - (int)currtpriority); + return ((int)p->p_rtprio.prio - (int)curproc->p_rtprio.prio); } /* @@ -471,7 +468,6 @@ tsleep(ident, priority, wmesg, timo) mi_switch(); resume: curpriority = p->p_usrpri; - currtpriority = p->p_rtprio.prio; splx(s); p->p_flag &= ~P_SINTR; if (p->p_flag & P_TIMEOUT) { @@ -611,7 +607,6 @@ await(int priority, int timo) mi_switch(); resume: curpriority = p->p_usrpri; - currtpriority = p->p_rtprio.prio; splx(s); p->p_flag &= ~P_SINTR; |
