d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I applied the wrong patch set. Back out anything associated

Browse Source 
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
This commit is contained in:
dufault 2000-03-02 22:03:49 +00:00
parent 2809faac72
commit 705c38904d
6 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/alpha/alpha/trap.c
View File

@ -129,7 +129,6 @@ userret(p, pc, oticks)
}
curpriority = p->p_priority;
currtpriority = p->p_rtprio.prio;
}
static void

1
sys/amd64/amd64/trap.c
View File

@ -196,7 +196,6 @@ userret(p, frame, oticks)
(u_int)(p->p_sticks - oticks) * psratio);
curpriority = p->p_priority;
currtpriority = p->p_rtprio.prio;
}
/*

1
sys/i386/i386/trap.c
View File

@ -196,7 +196,6 @@ userret(p, frame, oticks)
(u_int)(p->p_sticks - oticks) * psratio);
curpriority = p->p_priority;
currtpriority = p->p_rtprio.prio;
}
/*

7
sys/kern/kern_synch.c
View File

@ -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;

1
sys/kern/subr_trap.c
View File

@ -196,7 +196,6 @@ userret(p, frame, oticks)
(u_int)(p->p_sticks - oticks) * psratio);
curpriority = p->p_priority;
currtpriority = p->p_rtprio.prio;
}
/*

1
sys/sys/systm.h
View File

@ -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 */