diff options
| -rw-r--r-- | sys/alpha/alpha/trap.c | 1 | ||||
| -rw-r--r-- | sys/amd64/amd64/trap.c | 1 | ||||
| -rw-r--r-- | sys/i386/i386/trap.c | 1 | ||||
| -rw-r--r-- | sys/kern/kern_synch.c | 7 | ||||
| -rw-r--r-- | sys/kern/subr_trap.c | 1 | ||||
| -rw-r--r-- | sys/sys/systm.h | 1 |
6 files changed, 1 insertions, 11 deletions
diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c index b7c8b47..7e9b15e 100644 --- a/sys/alpha/alpha/trap.c +++ b/sys/alpha/alpha/trap.c @@ -129,7 +129,6 @@ userret(p, pc, oticks) } curpriority = p->p_priority; - currtpriority = p->p_rtprio.prio; } static void diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 836555c..a8b73cf 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -196,7 +196,6 @@ userret(p, frame, oticks) (u_int)(p->p_sticks - oticks) * psratio); curpriority = p->p_priority; - currtpriority = p->p_rtprio.prio; } /* diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 836555c..a8b73cf 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -196,7 +196,6 @@ userret(p, frame, oticks) (u_int)(p->p_sticks - oticks) * psratio); curpriority = p->p_priority; - currtpriority = p->p_rtprio.prio; } /* 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; diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 836555c..a8b73cf 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -196,7 +196,6 @@ userret(p, frame, oticks) (u_int)(p->p_sticks - oticks) * psratio); curpriority = p->p_priority; - currtpriority = p->p_rtprio.prio; } /* diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 2898389..3c2d784 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -59,7 +59,6 @@ extern int nswap; /* size of swap space */ extern int selwait; /* select timeout address */ extern u_char curpriority; /* priority of current process */ -extern u_char currtpriority; /* realtime priority of current process */ extern int physmem; /* physical memory */ |
