diff options
| author | jhb <jhb@FreeBSD.org> | 2000-11-15 22:05:23 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2000-11-15 22:05:23 +0000 |
| commit | c88865df678310490eb5f2f4429287a5c9761e5f (patch) | |
| tree | bda4651c610eed71b94f3c622bce5956a5477f36 /sys | |
| parent | c33eca4e334c078c9ebd3332946daf543318cf56 (diff) | |
| download | FreeBSD-src-c88865df678310490eb5f2f4429287a5c9761e5f.zip FreeBSD-src-c88865df678310490eb5f2f4429287a5c9761e5f.tar.gz | |
- Replace some instances of sched_ithd with sched_swi in KTR tracepoints.
- Assert that Giant is not owned during the main loop of sithd_loop().
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_intr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index b9ff07d..81a66a8 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -170,14 +170,14 @@ sched_swi(struct intrhand *ih, int flag) it->it_need = 1; mtx_enter(&sched_lock, MTX_SPIN); if (p->p_stat == SWAIT) { /* not on run queue */ - CTR1(KTR_INTR, "sched_ithd: setrunqueue %d", p->p_pid); + CTR1(KTR_INTR, "sched_swi: setrunqueue %d", p->p_pid); /* membar_lock(); */ p->p_stat = SRUN; setrunqueue(p); aston(); } else { - CTR3(KTR_INTR, "sched_ithd %d: it_need %d, state %d", + CTR3(KTR_INTR, "sched_swi %d: it_need %d, state %d", p->p_pid, it->it_need, p->p_stat ); } mtx_exit(&sched_lock, MTX_SPIN); @@ -235,6 +235,7 @@ sithd_loop(void *dummy) * lock. This may take a while and it_need may get * set again, so we have to check it again. */ + mtx_assert(&Giant, MA_NOTOWNED); mtx_enter(&sched_lock, MTX_SPIN); if (!it->it_need) { p->p_stat = SWAIT; /* we're idle */ |
