From owner-svn-src-all@FreeBSD.ORG  Fri Mar 26 18:54:46 2010
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 6DDCA1065676;
	Fri, 26 Mar 2010 18:54:46 +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 5C03F8FC17;
	Fri, 26 Mar 2010 18:54:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2QIskc6031333;
	Fri, 26 Mar 2010 18:54:46 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2QIskBX031329;
	Fri, 26 Mar 2010 18:54:46 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201003261854.o2QIskBX031329@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 26 Mar 2010 18:54:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205707 - in stable/7/sys: conf i386/conf i386/i386
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 Mar 2010 18:54:46 -0000

Author: jhb
Date: Fri Mar 26 18:54:46 2010
New Revision: 205707
URL: http://svn.freebsd.org/changeset/base/205707

Log:
  MFC 204972:
  Make NKPT a kernel option on i386 so that it can be set to a non-default
  value from kernel config files.

Modified:
  stable/7/sys/conf/options.i386
  stable/7/sys/i386/conf/NOTES
  stable/7/sys/i386/i386/mp_machdep.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/conf/options.i386
==============================================================================
--- stable/7/sys/conf/options.i386	Fri Mar 26 18:54:25 2010	(r205706)
+++ stable/7/sys/conf/options.i386	Fri Mar 26 18:54:46 2010	(r205707)
@@ -12,6 +12,7 @@ I586_PMC_GUPROF		opt_i586_guprof.h
 MAXMEM
 MPTABLE_FORCE_HTT
 MP_WATCHDOG
+NKPT			opt_pmap.h
 PERFMON
 PMAP_SHPGPERPROC	opt_pmap.h
 POWERFAIL_NMI		opt_trap.h

Modified: stable/7/sys/i386/conf/NOTES
==============================================================================
--- stable/7/sys/i386/conf/NOTES	Fri Mar 26 18:54:25 2010	(r205706)
+++ stable/7/sys/i386/conf/NOTES	Fri Mar 26 18:54:46 2010	(r205707)
@@ -1140,6 +1140,15 @@ options 	PMAP_SHPGPERPROC=201
 #
 options 	KVA_PAGES=260
 
+#
+# Number of initial kernel page table pages used for early bootstrap.
+# This number should include enough pages to map the kernel, any
+# modules or other data loaded with the kernel by the loader, and data
+# structures allocated before the VM system is initialized such as the
+# vm_page_t array.  Each page table page maps 4MB (2MB with PAE).
+#
+options 	NKPT=31
+
 
 #####################################################################
 # ABI Emulation

Modified: stable/7/sys/i386/i386/mp_machdep.c
==============================================================================
--- stable/7/sys/i386/i386/mp_machdep.c	Fri Mar 26 18:54:25 2010	(r205706)
+++ stable/7/sys/i386/i386/mp_machdep.c	Fri Mar 26 18:54:46 2010	(r205707)
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
 #include "opt_mp_watchdog.h"
+#include "opt_pmap.h"
 #include "opt_sched.h"
 #include "opt_smp.h"