diff options
| author | jhb <jhb@FreeBSD.org> | 2007-03-21 21:20:51 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2007-03-21 21:20:51 +0000 |
| commit | a84f74bb36d0c3edb2676543f0a1da4e07912da8 (patch) | |
| tree | 3b7e93e92bb0a2a4559d2d242f9c069564849c03 /sys/kern/kern_synch.c | |
| parent | 4b65fa3cdb272192c39a0e5cf223f9fe71dff949 (diff) | |
| download | FreeBSD-src-a84f74bb36d0c3edb2676543f0a1da4e07912da8.zip FreeBSD-src-a84f74bb36d0c3edb2676543f0a1da4e07912da8.tar.gz | |
Rename the 'mtx_object', 'rw_object', and 'sx_object' members of mutexes,
rwlocks, and sx locks to 'lock_object'.
Diffstat (limited to 'sys/kern/kern_synch.c')
| -rw-r--r-- | sys/kern/kern_synch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 25b77e3..6e23d0d 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -270,13 +270,13 @@ msleep_spin(ident, mtx, wmesg, timo) DROP_GIANT(); mtx_assert(mtx, MA_OWNED | MA_NOTRECURSED); - WITNESS_SAVE(&mtx->mtx_object, mtx); + WITNESS_SAVE(&mtx->lock_object, mtx); mtx_unlock_spin(mtx); /* * We put ourselves on the sleep queue and start our timeout. */ - sleepq_add(ident, &mtx->mtx_object, wmesg, SLEEPQ_SLEEP, 0); + sleepq_add(ident, &mtx->lock_object, wmesg, SLEEPQ_SLEEP, 0); if (timo) sleepq_set_timeout(ident, timo); @@ -312,7 +312,7 @@ msleep_spin(ident, mtx, wmesg, timo) #endif PICKUP_GIANT(); mtx_lock_spin(mtx); - WITNESS_RESTORE(&mtx->mtx_object, mtx); + WITNESS_RESTORE(&mtx->lock_object, mtx); return (rval); } |
