From owner-svn-src-user@FreeBSD.ORG  Wed Nov  5 23:58:40 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ABFD3106564A;
	Wed,  5 Nov 2008 23:58:40 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B5EA8FC1C;
	Wed,  5 Nov 2008 23:58:40 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA5Nwera040299;
	Wed, 5 Nov 2008 23:58:40 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA5NweCY040298;
	Wed, 5 Nov 2008 23:58:40 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811052358.mA5NweCY040298@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 5 Nov 2008 23:58:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184703 - user/kmacy/HEAD_multi_tx/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Nov 2008 23:58:40 -0000

Author: kmacy
Date: Wed Nov  5 23:58:40 2008
New Revision: 184703
URL: http://svn.freebsd.org/changeset/base/184703

Log:
  fix setting of nmbclusters

Modified:
  user/kmacy/HEAD_multi_tx/sys/kern/kern_mbuf.c

Modified: user/kmacy/HEAD_multi_tx/sys/kern/kern_mbuf.c
==============================================================================
--- user/kmacy/HEAD_multi_tx/sys/kern/kern_mbuf.c	Wed Nov  5 21:44:20 2008	(r184702)
+++ user/kmacy/HEAD_multi_tx/sys/kern/kern_mbuf.c	Wed Nov  5 23:58:40 2008	(r184703)
@@ -104,13 +104,14 @@ struct mbstat mbstat;
 static void
 tunable_mbinit(void *dummy)
 {
+	TUNABLE_INT_FETCH("kern.ipc.nmbclusters", &nmbclusters);
 
 	/* This has to be done before VM init. */
-	nmbclusters = 1024 + maxusers * 64;
+	if (nmbclusters == 0)
+		nmbclusters = 1024 + maxusers * 64;
 	nmbjumbop = nmbclusters / 2;
 	nmbjumbo9 = nmbjumbop / 2;
 	nmbjumbo16 = nmbjumbo9 / 2;
-	TUNABLE_INT_FETCH("kern.ipc.nmbclusters", &nmbclusters);
 }
 SYSINIT(tunable_mbinit, SI_SUB_TUNABLES, SI_ORDER_ANY, tunable_mbinit, NULL);