svn commit: r287231 - stable/10/sys/kern

[Mark Johnston]

Author: markj
Date: Fri Aug 28 00:06:31 2015
New Revision: 287231
URL: https://svnweb.freebsd.org/changeset/base/287231

Log:
  MFC r285252:
  Fix an incorrect assertion in witness.

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

Modified: stable/10/sys/kern/subr_witness.c
==============================================================================
--- stable/10/sys/kern/subr_witness.c	Thu Aug 27 23:55:46 2015	(r287230)
+++ stable/10/sys/kern/subr_witness.c	Fri Aug 28 00:06:31 2015	(r287231)
@@ -1221,7 +1221,7 @@ witness_checkorder(struct lock_object *l
 	for (j = 0, lle = lock_list; lle != NULL; lle = lle->ll_next) {
 		for (i = lle->ll_count - 1; i >= 0; i--, j++) {
 
-			MPASS(j < WITNESS_COUNT);
+			MPASS(j < LOCK_CHILDCOUNT * LOCK_NCHILDREN);
 			lock1 = &lle->ll_children[i];
 
 			/*