aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMateusz Guzik <mjg@FreeBSD.org>2017-11-17 02:59:28 +0000
committerMateusz Guzik <mjg@FreeBSD.org>2017-11-17 02:59:28 +0000
commit2ccee9cc522bb6260efba1b6efebfee2ba43c606 (patch)
tree5152da63e37b3019de43ef4c0d38246ec2533b34 /sys
parent32aef9ff05d6dda84bd8924efca2f5fb30e602d2 (diff)
downloadsrc-2ccee9cc522bb6260efba1b6efebfee2ba43c606.tar.gz
src-2ccee9cc522bb6260efba1b6efebfee2ba43c606.zip
mtx: add missing parts of the diff in r325920
Fixes build breakage.
Notes
Notes: svn path=/head/; revision=325925
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/kern_mutex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index 27df45c10757..063456ec9f97 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -463,7 +463,7 @@ __mtx_lock_sleep(volatile uintptr_t *c, uintptr_t v)
struct turnstile *ts;
uintptr_t tid;
#ifdef ADAPTIVE_MUTEXES
- volatile struct thread *owner;
+ struct thread *owner;
#endif
#ifdef KTR
int cont_logged = 0;
@@ -1003,7 +1003,7 @@ __mtx_unlock_sleep(volatile uintptr_t *c)
{
struct mtx *m;
struct turnstile *ts;
- uintptr_t tid;
+ uintptr_t tid, v;
if (SCHEDULER_STOPPED())
return;