svn commit: r325925 - head/sys/kern

[Mateusz Guzik]

Author: mjg
Date: Fri Nov 17 02:59:28 2017
New Revision: 325925
URL: https://svnweb.freebsd.org/changeset/base/325925

Log:
  mtx: add missing parts of the diff in r325920
  
  Fixes build breakage.

Modified:
  head/sys/kern/kern_mutex.c

Modified: head/sys/kern/kern_mutex.c
==============================================================================
--- head/sys/kern/kern_mutex.c	Fri Nov 17 02:45:38 2017	(r325924)
+++ head/sys/kern/kern_mutex.c	Fri Nov 17 02:59:28 2017	(r325925)
@@ -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;