svn commit: r314063 - stable/11/sys/kern

[Mark Johnston]

Author: markj
Date: Wed Feb 22 00:50:36 2017
New Revision: 314063
URL: https://svnweb.freebsd.org/changeset/base/314063

Log:
  MFC r313261:
  Make witness_warn() always print to the console.

Modified:
  stable/11/sys/kern/subr_witness.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/subr_witness.c
==============================================================================
--- stable/11/sys/kern/subr_witness.c	Tue Feb 21 23:32:27 2017	(r314062)
+++ stable/11/sys/kern/subr_witness.c	Wed Feb 22 00:50:36 2017	(r314063)
@@ -1733,15 +1733,14 @@ witness_warn(int flags, struct lock_obje
 				continue;
 			if (n == 0) {
 				va_start(ap, fmt);
-				witness_voutput(fmt, ap);
+				vprintf(fmt, ap);
 				va_end(ap);
-				witness_output(
-				    " with the following %slocks held:\n",
+				printf(" with the following %slocks held:\n",
 				    (flags & WARN_SLEEPOK) != 0 ?
 				    "non-sleepable " : "");
 			}
 			n++;
-			witness_list_lock(lock1, witness_output);
+			witness_list_lock(lock1, printf);
 		}
 
 	/*
@@ -1766,11 +1765,11 @@ witness_warn(int flags, struct lock_obje
 			return (0);
 
 		va_start(ap, fmt);
-		witness_voutput(fmt, ap);
+		vprintf(fmt, ap);
 		va_end(ap);
-		witness_output(" with the following %slocks held:\n",
+		printf(" 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, printf);
 	} else
 		sched_unpin();
 	if (flags & WARN_PANIC && n)