From owner-svn-src-head@FreeBSD.ORG  Sun Aug  3 05:00:44 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BEB02C54;
 Sun,  3 Aug 2014 05:00:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 AC9A429D9;
 Sun,  3 Aug 2014 05:00:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7350iDW096576;
 Sun, 3 Aug 2014 05:00:44 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7350iDE096574;
 Sun, 3 Aug 2014 05:00:44 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201408030500.s7350iDE096574@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 3 Aug 2014 05:00:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269459 - in head/sys: conf 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.18
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: Sun, 03 Aug 2014 05:00:44 -0000

Author: imp
Date: Sun Aug  3 05:00:43 2014
New Revision: 269459
URL: http://svnweb.freebsd.org/changeset/base/269459

Log:
  Make the witness lock limit an option.

Modified:
  head/sys/conf/options
  head/sys/kern/subr_witness.c

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Sun Aug  3 03:51:33 2014	(r269458)
+++ head/sys/conf/options	Sun Aug  3 05:00:43 2014	(r269459)
@@ -685,6 +685,7 @@ WITNESS			opt_global.h
 WITNESS_KDB		opt_witness.h
 WITNESS_NO_VNODE	opt_witness.h
 WITNESS_SKIPSPIN	opt_witness.h
+WITNESS_COUNT		opt_witness.h
 OPENSOLARIS_WITNESS	opt_global.h
 
 # options for ACPI support

Modified: head/sys/kern/subr_witness.c
==============================================================================
--- head/sys/kern/subr_witness.c	Sun Aug  3 03:51:33 2014	(r269458)
+++ head/sys/kern/subr_witness.c	Sun Aug  3 05:00:43 2014	(r269459)
@@ -132,7 +132,9 @@ __FBSDID("$FreeBSD$");
 /* Define this to check for blessed mutexes */
 #undef BLESSING
 
+#ifndef WITNESS_COUNT
 #define	WITNESS_COUNT 		1536
+#endif
 #define	WITNESS_CHILDCOUNT 	(WITNESS_COUNT * 4)
 #define	WITNESS_HASH_SIZE	251	/* Prime, gives load factor < 2 */
 #define	WITNESS_PENDLIST	(1024 + MAXCPU)