svn commit: r253047 - head/sys/kern

[John Baldwin]

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 at 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