Index: sys/kern/subr_witness.c
===================================================================
--- sys/kern/subr_witness.c
+++ sys/kern/subr_witness.c
@@ -97,6 +97,7 @@
 #include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
+#include <sys/kwarn.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
@@ -1718,15 +1719,15 @@
 				continue;
 			if (n == 0) {
 				va_start(ap, fmt);
-				witness_voutput(fmt, ap);
+				vkwarn(fmt, ap);
 				va_end(ap);
-				witness_output(
-				    " with the following %slocks held:\n",
+				kwarn(" with the following %slocks held:\n",
 				    (flags & WARN_SLEEPOK) != 0 ?
 				    "non-sleepable " : "");
 			}
 			n++;
-			witness_list_lock(lock1, witness_output);
+			witness_list_lock(lock1,
+			    (int(*)(const char *, ...)) kwarn);
 		}
 
 	/*
@@ -1751,11 +1752,12 @@
 			return (0);
 
 		va_start(ap, fmt);
-		witness_voutput(fmt, ap);
+		vkwarn(fmt, ap);
 		va_end(ap);
-		witness_output(" with the following %slocks held:\n",
+		kwarn(" with the following %slocks held:\n",
 		    (flags & WARN_SLEEPOK) != 0 ?  "non-sleepable " : "");
-		n += witness_list_locks(&lock_list, witness_output);
+		n += witness_list_locks(&lock_list,
+		    (int(*)(const char *, ...)) kwarn);
 	} else
 		sched_unpin();
 	if (flags & WARN_PANIC && n)