Sun Mar 8 11:21:29 2020 UTC ()
Pull up following revision(s) (requested by chs in ticket #768):

	sys/kern/kern_mutex.c: revision 1.90

split an "a && b" assertion into two so it's clear in the dump which condition
was not true even if both are true by the time the dump is written.


(martin)
diff -r1.79 -r1.79.2.1 src/sys/kern/kern_mutex.c

cvs diff -r1.79 -r1.79.2.1 src/sys/kern/kern_mutex.c (expand / switch to context diff)
--- src/sys/kern/kern_mutex.c 2019/05/09 05:00:31 1.79
+++ src/sys/kern/kern_mutex.c 2020/03/08 11:21:29 1.79.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_mutex.c,v 1.79 2019/05/09 05:00:31 ozaki-r Exp $	*/
+/*	$NetBSD: kern_mutex.c,v 1.79.2.1 2020/03/08 11:21:29 martin Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 #define	__MUTEX_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.79 2019/05/09 05:00:31 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.79.2.1 2020/03/08 11:21:29 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -397,8 +397,8 @@
 {
 
 	if (MUTEX_ADAPTIVE_P(mtx)) {
-		MUTEX_ASSERT(mtx, !MUTEX_OWNED(mtx->mtx_owner) &&
-		    !MUTEX_HAS_WAITERS(mtx));
+		MUTEX_ASSERT(mtx, !MUTEX_OWNED(mtx->mtx_owner));
+		MUTEX_ASSERT(mtx, !MUTEX_HAS_WAITERS(mtx));
 	} else {
 		MUTEX_ASSERT(mtx, !MUTEX_SPINBIT_LOCKED_P(mtx));
 	}