From owner-svn-src-head@freebsd.org  Thu Mar  9 00:58:22 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 E7DEAD034CB;
 Thu,  9 Mar 2017 00:58:22 +0000 (UTC)
 (envelope-from glebius@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 B79BBCC;
 Thu,  9 Mar 2017 00:58:22 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v290wLqb050748;
 Thu, 9 Mar 2017 00:58:21 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v290wLVN050747;
 Thu, 9 Mar 2017 00:58:21 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201703090058.v290wLVN050747@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 9 Mar 2017 00:58:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314932 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Mar 2017 00:58:23 -0000

Author: glebius
Date: Thu Mar  9 00:58:21 2017
New Revision: 314932
URL: https://svnweb.freebsd.org/changeset/base/314932

Log:
  Do not turn LOCK_DEBUG for INVARIANT_SUPPORT.  This allows to add
  INVARIANT_SUPPORT into a kernel without performance penalties.
  
  Discussed with:	jhb, mjg

Modified:
  head/sys/sys/lock.h

Modified: head/sys/sys/lock.h
==============================================================================
--- head/sys/sys/lock.h	Thu Mar  9 00:56:07 2017	(r314931)
+++ head/sys/sys/lock.h	Thu Mar  9 00:58:21 2017	(r314932)
@@ -126,7 +126,7 @@ struct lock_class {
  * work with both debug and non-debug kernels.
  */
 #if defined(KLD_MODULE) || defined(WITNESS) || defined(INVARIANTS) || \
-    defined(INVARIANT_SUPPORT) || defined(LOCK_PROFILING) || defined(KTR)
+    defined(LOCK_PROFILING) || defined(KTR)
 #define	LOCK_DEBUG	1
 #else
 #define	LOCK_DEBUG	0