diff options
| author | jhb <jhb@FreeBSD.org> | 2002-10-02 20:31:47 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2002-10-02 20:31:47 +0000 |
| commit | 8c9a393a0433c7cc2ee90541164cdcb927fa5bdb (patch) | |
| tree | 4e540e60eb5d2ee3fc581a4014df11fe04763455 /sys/kern/kern_synch.c | |
| parent | f4c70e659ffb00b8f69da48f3d5a0e5bb540f8cb (diff) | |
| download | FreeBSD-src-8c9a393a0433c7cc2ee90541164cdcb927fa5bdb.zip FreeBSD-src-8c9a393a0433c7cc2ee90541164cdcb927fa5bdb.tar.gz | |
Rename the mutex thread and process states to use a more generic 'LOCK'
name instead. (e.g., SLOCK instead of SMTX, TD_ON_LOCK() instead of
TD_ON_MUTEX()) Eventually a turnstile abstraction will be added that
will be shared with mutexes and other types of locks. SLOCK/TDI_LOCK will
be used internally by the turnstile code and will not be specific to
mutexes. Making the change now ensures that turnstiles can be dropped
in at a later date without affecting the ABI of userland applications.
Diffstat (limited to 'sys/kern/kern_synch.c')
| -rw-r--r-- | sys/kern/kern_synch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index d46ef12..83f3d28 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -759,7 +759,7 @@ mi_switch(void) KASSERT((ke->ke_state == KES_THREAD), ("mi_switch: kse state?")); KASSERT(!TD_ON_RUNQ(td), ("mi_switch: called by old code")); #ifdef INVARIANTS - if (!TD_ON_MUTEX(td) && + if (!TD_ON_LOCK(td) && !TD_ON_RUNQ(td) && !TD_IS_RUNNING(td)) mtx_assert(&Giant, MA_NOTOWNED); |
