From owner-svn-src-all@FreeBSD.ORG  Fri Aug 26 17:08:23 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1EE5B1065672;
	Fri, 26 Aug 2011 17:08:23 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E85C18FC08;
	Fri, 26 Aug 2011 17:08:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7QH8M7Y063595;
	Fri, 26 Aug 2011 17:08:22 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7QH8MAW063591;
	Fri, 26 Aug 2011 17:08:22 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201108261708.p7QH8MAW063591@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 26 Aug 2011 17:08:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225194 - in head/sys: amd64/amd64 amd64/conf conf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Aug 2011 17:08:23 -0000

Author: jhb
Date: Fri Aug 26 17:08:22 2011
New Revision: 225194
URL: http://svn.freebsd.org/changeset/base/225194

Log:
  Make NKPT a kernel option on amd64 so that it can be set to a non-default
  value from kernel config files.
  
  Reviewed by:	alc
  Approved by:	re (kib)
  MFC after:	1 week

Modified:
  head/sys/amd64/amd64/minidump_machdep.c
  head/sys/amd64/conf/NOTES
  head/sys/conf/options.amd64

Modified: head/sys/amd64/amd64/minidump_machdep.c
==============================================================================
--- head/sys/amd64/amd64/minidump_machdep.c	Fri Aug 26 17:02:53 2011	(r225193)
+++ head/sys/amd64/amd64/minidump_machdep.c	Fri Aug 26 17:08:22 2011	(r225194)
@@ -27,6 +27,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_pmap.h"
 #include "opt_watchdog.h"
 
 #include <sys/param.h>

Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES	Fri Aug 26 17:02:53 2011	(r225193)
+++ head/sys/amd64/conf/NOTES	Fri Aug 26 17:08:22 2011	(r225194)
@@ -490,6 +490,14 @@ options 	ENABLE_ALART		# Control alarm o
 #
 options 	PMAP_SHPGPERPROC=201
 
+#
+# Number of initial kernel page table pages used for early bootstrap.
+# This number should include enough pages to map the kernel and any
+# modules or other data loaded with the kernel by the loader.  Each
+# page table page maps 2MB.
+#
+options 	NKPT=31
+
 
 #####################################################################
 # ABI Emulation

Modified: head/sys/conf/options.amd64
==============================================================================
--- head/sys/conf/options.amd64	Fri Aug 26 17:02:53 2011	(r225193)
+++ head/sys/conf/options.amd64	Fri Aug 26 17:08:22 2011	(r225194)
@@ -10,6 +10,7 @@ PERFMON
 PMAP_SHPGPERPROC	opt_pmap.h
 MPTABLE_FORCE_HTT
 MP_WATCHDOG
+NKPT			opt_pmap.h
 
 # Options for emulators.  These should only be used at config time, so
 # they are handled like options for static filesystems