Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Sep 2016 15:30:30 +0000 (UTC)
From:      Eric van Gyzen <vangyzen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r306346 - head/sys/kern
Message-ID:  <201609261530.u8QFUUZd020174@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vangyzen
Date: Mon Sep 26 15:30:30 2016
New Revision: 306346
URL: https://svnweb.freebsd.org/changeset/base/306346

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

Modified:
  head/sys/kern/kern_mutex.c

Modified: head/sys/kern/kern_mutex.c
==============================================================================
--- head/sys/kern/kern_mutex.c	Mon Sep 26 15:03:31 2016	(r306345)
+++ head/sys/kern/kern_mutex.c	Mon Sep 26 15:30:30 2016	(r306346)
@@ -924,7 +924,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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609261530.u8QFUUZd020174>