From owner-svn-src-head@FreeBSD.ORG  Mon Jul  8 21:17:21 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 36E2FC4;
 Mon,  8 Jul 2013 21:17:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 297191996;
 Mon,  8 Jul 2013 21:17:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r68LHLET020936;
 Mon, 8 Jul 2013 21:17:21 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r68LHL9O020935;
 Mon, 8 Jul 2013 21:17:21 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201307082117.r68LHL9O020935@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 8 Jul 2013 21:17:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253047 - head/sys/kern
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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jul 2013 21:17:21 -0000

Author: jhb
Date: Mon Jul  8 21:17:20 2013
New Revision: 253047
URL: http://svnweb.freebsd.org/changeset/base/253047

Log:
  Fix build with INVARIANT_SUPPORT enabled but not INVARIANTS.
  
  Reported by:	"Matthew D. Fuller" <fullermd@over-yonder.net>

Modified:
  head/sys/kern/kern_rmlock.c

Modified: head/sys/kern/kern_rmlock.c
==============================================================================
--- head/sys/kern/kern_rmlock.c	Mon Jul  8 21:10:30 2013	(r253046)
+++ head/sys/kern/kern_rmlock.c	Mon Jul  8 21:17:20 2013	(r253047)
@@ -704,6 +704,10 @@ _rm_runlock_debug(struct rmlock *rm, str
 #endif
 
 #ifdef INVARIANT_SUPPORT
+#ifndef INVARIANTS
+#undef _rm_assert
+#endif
+
 /*
  * Note that this does not need to use witness_assert() for read lock
  * assertions since an exact count of read locks held by this thread