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

- GC some #if 0'd code regarding the non-existant safepri variable.

Browse Source 
- Don't dink with the witness state of Giant unless we actually own it
  during mi_switch().
This commit is contained in:
John Baldwin 2000-10-20 07:52:10 +00:00
parent d1182da2cf
commit 700bfa750f
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/kern/kern_synch.c
View File

@ -44,8 +44,10 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/ipl.h>
#include <sys/kernel.h>
#include <sys/ktr.h>
#include <sys/mutex.h>
#include <sys/signalvar.h>
#include <sys/resourcevar.h>
#include <sys/vmmeter.h>
@ -58,9 +60,7 @@
#endif
#include <machine/cpu.h>
#include <machine/ipl.h>
#include <machine/smp.h>
#include <machine/mutex.h>
static void sched_setup __P((void *dummy));
SYSINIT(sched_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, sched_setup, NULL)
@ -377,19 +377,6 @@ updatepri(p)
static TAILQ_HEAD(slpquehead, proc) slpque[TABLESIZE];
#define LOOKUP(x) (((intptr_t)(x) >> 8) & (TABLESIZE - 1))
#if 0
/*
* During autoconfiguration or after a panic, a sleep will simply
* lower the priority briefly to allow interrupts, then return.
* The priority to be used (safepri) is machine-dependent, thus this
* value is initialized and maintained in the machine-dependent layers.
* This priority will typically be 0, or the lowest priority
* that is safe for use on the interrupt stack; it can be made
* higher to block network software interrupts after panics.
*/
int safepri;
#endif
void
sleepinit(void)
{
@ -899,7 +886,8 @@ mi_switch()
p, p->p_pid, p->p_comm, (void *) sched_lock.mtx_lock);
mtx_enter(&sched_lock, MTX_SPIN | MTX_RLIKELY);
WITNESS_SAVE(&Giant, Giant);
if (mtx_owned(&Giant))
WITNESS_SAVE(&Giant, Giant);
for (giantreleased = 0; mtx_owned(&Giant); giantreleased++)
mtx_exit(&Giant, MTX_DEF | MTX_NOSWITCH);
@ -958,7 +946,8 @@ mi_switch()
mtx_exit(&sched_lock, MTX_SPIN);
while (giantreleased--)
mtx_enter(&Giant, MTX_DEF);
WITNESS_RESTORE(&Giant, Giant);
if (mtx_owned(&Giant))
WITNESS_RESTORE(&Giant, Giant);
splx(x);
}