From owner-svn-src-head@FreeBSD.ORG  Sat Oct  5 18:53:04 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 26FCF9F2;
 Sat,  5 Oct 2013 18:53:04 +0000 (UTC) (envelope-from alc@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 12B622021;
 Sat,  5 Oct 2013 18:53:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r95Ir3I8073480;
 Sat, 5 Oct 2013 18:53:03 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r95Ir3OP073479;
 Sat, 5 Oct 2013 18:53:03 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201310051853.r95Ir3OP073479@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sat, 5 Oct 2013 18:53:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256068 - 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: Sat, 05 Oct 2013 18:53:04 -0000

Author: alc
Date: Sat Oct  5 18:53:03 2013
New Revision: 256068
URL: http://svnweb.freebsd.org/changeset/base/256068

Log:
  Tidy up kmeminit(): Since r245575, 'nmbclusters' is calculated after
  kmeminit() runs, so it contributes nothing to 'vm_kmem_size'; update a
  comment to reflect that r254025 replaced the kmem submap with the kmem
  arena.
  
  Reviewed by:	kib
  Approved by:	re (gjb)
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/kern/kern_malloc.c

Modified: head/sys/kern/kern_malloc.c
==============================================================================
--- head/sys/kern/kern_malloc.c	Sat Oct  5 18:41:27 2013	(r256067)
+++ head/sys/kern/kern_malloc.c	Sat Oct  5 18:53:03 2013	(r256068)
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/vmmeter.h>
 #include <sys/proc.h>
@@ -699,10 +698,10 @@ kmeminit(void)
 	 * VM_KMEM_SIZE_MAX is dependent on the maximum KVA space
 	 * available.
 	 *
-	 * Note that the kmem_map is also used by the zone allocator,
+	 * Note that the kmem arena is also used by the zone allocator,
 	 * so make sure that there is enough space.
 	 */
-	vm_kmem_size = VM_KMEM_SIZE + nmbclusters * PAGE_SIZE;
+	vm_kmem_size = VM_KMEM_SIZE;
 	mem_size = cnt.v_page_count;
 
 #if defined(VM_KMEM_SIZE_SCALE)