svn commit: r225626 - in stable/8/sys: amd64/amd64 amd64/conf conf

[John Baldwin]

Author: jhb
Date: Fri Sep 16 18:36:43 2011
New Revision: 225626
URL: http://svn.freebsd.org/changeset/base/225626

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

Modified:
  stable/8/sys/amd64/amd64/minidump_machdep.c
  stable/8/sys/amd64/conf/NOTES
  stable/8/sys/conf/options.amd64
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/amd64/amd64/minidump_machdep.c
==============================================================================
--- stable/8/sys/amd64/amd64/minidump_machdep.c	Fri Sep 16 18:26:40 2011	(r225625)
+++ stable/8/sys/amd64/amd64/minidump_machdep.c	Fri Sep 16 18:36:43 2011	(r225626)
@@ -27,6 +27,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_pmap.h"
 #include "opt_watchdog.h"
 
 #include <sys/param.h>

Modified: stable/8/sys/amd64/conf/NOTES
==============================================================================
--- stable/8/sys/amd64/conf/NOTES	Fri Sep 16 18:26:40 2011	(r225625)
+++ stable/8/sys/amd64/conf/NOTES	Fri Sep 16 18:36:43 2011	(r225626)
@@ -493,6 +493,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: stable/8/sys/conf/options.amd64
==============================================================================
--- stable/8/sys/conf/options.amd64	Fri Sep 16 18:26:40 2011	(r225625)
+++ stable/8/sys/conf/options.amd64	Fri Sep 16 18:36:43 2011	(r225626)
@@ -8,6 +8,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