From owner-svn-src-stable@freebsd.org  Wed Oct 19 00:14:24 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2ACDAC12C03;
 Wed, 19 Oct 2016 00:14:24 +0000 (UTC)
 (envelope-from vangyzen@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id ECF4BF73;
 Wed, 19 Oct 2016 00:14:23 +0000 (UTC)
 (envelope-from vangyzen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9J0ENoa055921;
 Wed, 19 Oct 2016 00:14:23 GMT (envelope-from vangyzen@FreeBSD.org)
Received: (from vangyzen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9J0ENcq055920;
 Wed, 19 Oct 2016 00:14:23 GMT (envelope-from vangyzen@FreeBSD.org)
Message-Id: <201610190014.u9J0ENcq055920@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to
 vangyzen@FreeBSD.org using -f
From: Eric van Gyzen <vangyzen@FreeBSD.org>
Date: Wed, 19 Oct 2016 00:14:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r307588 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Oct 2016 00:14:24 -0000

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

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/10/sys/kern/kern_mutex.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_mutex.c
==============================================================================
--- stable/10/sys/kern/kern_mutex.c	Wed Oct 19 00:14:20 2016	(r307587)
+++ stable/10/sys/kern/kern_mutex.c	Wed Oct 19 00:14:22 2016	(r307588)
@@ -848,7 +848,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);