diff options
| author | jeff <jeff@FreeBSD.org> | 2007-06-06 03:40:47 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2007-06-06 03:40:47 +0000 |
| commit | 7a9c95c1006958928813d10d99735b67778a03e7 (patch) | |
| tree | 6e1a416746fad7d57f2b0f3b1f0430655bd995a9 /sys/kern/kern_mutex.c | |
| parent | aed2a0bc2931b2e8d1b39a45093c62e28fb3ff3d (diff) | |
| download | FreeBSD-src-7a9c95c1006958928813d10d99735b67778a03e7.zip FreeBSD-src-7a9c95c1006958928813d10d99735b67778a03e7.tar.gz | |
- Placing the 'volatile' on the right side of the * in the td_lock
declaration removes the need for __DEVOLATILE().
Pointed out by: tegge
Diffstat (limited to 'sys/kern/kern_mutex.c')
| -rw-r--r-- | sys/kern/kern_mutex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index a144062..c251c75 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -504,7 +504,7 @@ _thread_lock_flags(struct thread *td, int opts, const char *file, int line) for (;;) { retry: spinlock_enter(); - m = __DEVOLATILE(struct mtx *, td->td_lock); + m = td->td_lock; WITNESS_CHECKORDER(&m->lock_object, opts | LOP_NEWORDER | LOP_EXCLUSIVE, file, line); while (!_obtain_lock(m, tid)) { @@ -542,7 +542,7 @@ thread_lock_block(struct thread *td) spinlock_enter(); THREAD_LOCK_ASSERT(td, MA_OWNED); - lock = __DEVOLATILE(struct mtx *, td->td_lock); + lock = td->td_lock; td->td_lock = &blocked_lock; mtx_unlock_spin(lock); @@ -565,7 +565,7 @@ thread_lock_set(struct thread *td, struct mtx *new) mtx_assert(new, MA_OWNED); THREAD_LOCK_ASSERT(td, MA_OWNED); - lock = __DEVOLATILE(struct mtx *, td->td_lock); + lock = td->td_lock; td->td_lock = new; mtx_unlock_spin(lock); } |
