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

[Eric van Gyzen]

Author: vangyzen
Date: Wed Oct 19 00:14:20 2016
New Revision: 307587
URL: https://svnweb.freebsd.org/changeset/base/307587

Log:
  MFC r306346
  
  Make no assertions about mutex state when the scheduler is stopped.
  
  This changes the assert path to match the lock and unlock paths.
  
  Sponsored by:	Dell EMC

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

Modified: stable/11/sys/kern/kern_mutex.c
==============================================================================
--- stable/11/sys/kern/kern_mutex.c	Tue Oct 18 23:48:47 2016	(r307586)
+++ stable/11/sys/kern/kern_mutex.c	Wed Oct 19 00:14:20 2016	(r307587)
@@ -887,7 +887,7 @@ __mtx_assert(const volatile uintptr_t *c
 {
 	const struct mtx *m;
 
-	if (panicstr != NULL || dumping)
+	if (panicstr != NULL || dumping || SCHEDULER_STOPPED())
 		return;
 
 	m = mtxlock2mtx(c);