From owner-svn-src-stable-10@freebsd.org  Wed Aug  5 11:00:00 2015
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 62D789B3EA4;
 Wed,  5 Aug 2015 11:00:00 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 541001676;
 Wed,  5 Aug 2015 11:00:00 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t75B001q065779;
 Wed, 5 Aug 2015 11:00:00 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t75B003v065778;
 Wed, 5 Aug 2015 11:00:00 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201508051100.t75B003v065778@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 5 Aug 2015 11:00:00 +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: r286315 - 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-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Aug 2015 11:00:00 -0000

Author: ae
Date: Wed Aug  5 10:59:59 2015
New Revision: 286315
URL: https://svnweb.freebsd.org/changeset/base/286315

Log:
  MFC r285888:
    Build debug version of rmlock's methods only when LOCK_DEBUG > 0.
  
    Currently LOCK_DEBUG is always defined in sys/lock.h (0 or 1).
    This means that debugging code always built. In addition the kernel
    modules have always defined LOCK_DEBUG as 1. So, debugging rmlock code
    is always used by kernel modules.

Modified:
  stable/10/sys/kern/kern_rmlock.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_rmlock.c
==============================================================================
--- stable/10/sys/kern/kern_rmlock.c	Wed Aug  5 10:50:33 2015	(r286314)
+++ stable/10/sys/kern/kern_rmlock.c	Wed Aug  5 10:59:59 2015	(r286315)
@@ -581,7 +581,7 @@ _rm_wunlock(struct rmlock *rm)
 		mtx_unlock(&rm->rm_lock_mtx);
 }
 
-#ifdef LOCK_DEBUG
+#if LOCK_DEBUG > 0
 
 void
 _rm_wlock_debug(struct rmlock *rm, const char *file, int line)