30c30
< * $FreeBSD: head/sys/kern/subr_turnstile.c 104161 2002-09-29 23:28:58Z julian $
---
> * $FreeBSD: head/sys/kern/subr_turnstile.c 104387 2002-10-02 20:31:47Z jhb $
166c166
< KASSERT(TD_ON_MUTEX(td), (
---
> KASSERT(TD_ON_LOCK(td), (
185c185
< td1 = TAILQ_PREV(td, threadqueue, td_blkq);
---
> td1 = TAILQ_PREV(td, threadqueue, td_lockq);
197,198c197,198
< TAILQ_REMOVE(&m->mtx_blocked, td, td_blkq);
< TAILQ_FOREACH(td1, &m->mtx_blocked, td_blkq) {
---
> TAILQ_REMOVE(&m->mtx_blocked, td, td_lockq);
> TAILQ_FOREACH(td1, &m->mtx_blocked, td_lockq) {
205c205
< TAILQ_INSERT_BEFORE(td1, td, td_blkq);
---
> TAILQ_INSERT_BEFORE(td1, td, td_lockq);
594c594
< TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_blkq);
---
> TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_lockq);
596c596
< TAILQ_FOREACH(td1, &m->mtx_blocked, td_blkq)
---
> TAILQ_FOREACH(td1, &m->mtx_blocked, td_lockq)
600c600
< TAILQ_INSERT_BEFORE(td1, td, td_blkq);
---
> TAILQ_INSERT_BEFORE(td1, td, td_lockq);
602c602
< TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_blkq);
---
> TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_lockq);
619,620c619,620
< td->td_mtxname = m->mtx_object.lo_name;
< TD_SET_MUTEX(td);
---
> td->td_lockname = m->mtx_object.lo_name;
> TD_SET_LOCK(td);
738c738
< TAILQ_REMOVE(&m->mtx_blocked, td1, td_blkq);
---
> TAILQ_REMOVE(&m->mtx_blocked, td1, td_lockq);
764c764
< TD_CLR_MUTEX(td1);
---
> TD_CLR_LOCK(td1);