svn commit: r255205 - head/sys/kern

[John Baldwin]

Author: jhb
Date: Wed Sep  4 11:52:28 2013
New Revision: 255205
URL: http://svnweb.freebsd.org/changeset/base/255205

Log:
  Trim a couple of panic messages.

Modified:
  head/sys/kern/subr_witness.c

Modified: head/sys/kern/subr_witness.c
==============================================================================
--- head/sys/kern/subr_witness.c	Wed Sep  4 11:28:47 2013	(r255204)
+++ head/sys/kern/subr_witness.c	Wed Sep  4 11:52:28 2013	(r255205)
@@ -1138,18 +1138,12 @@ witness_checkorder(struct lock_object *l
 		iclass = LOCK_CLASS(interlock);
 		lock1 = find_instance(lock_list, interlock);
 		if (lock1 == NULL)
-			kassert_panic(
-			    "interlock (%s) %s not locked while locking"
-			    " %s @ %s:%d",
+			kassert_panic("interlock (%s) %s not locked @ %s:%d",
 			    iclass->lc_name, interlock->lo_name,
-			    flags & LOP_EXCLUSIVE ? "exclusive" : "shared",
 			    fixup_filename(file), line);
 		else if ((lock1->li_flags & LI_RECURSEMASK) != 0)
-			kassert_panic(
-			    "interlock (%s) %s recursed while locking %s"
-			    " @ %s:%d",
+			kassert_panic("interlock (%s) %s recursed @ %s:%d",
 			    iclass->lc_name, interlock->lo_name,
-			    flags & LOP_EXCLUSIVE ? "exclusive" : "shared",
 			    fixup_filename(file), line);
 	}