summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2011-08-26 17:08:22 +0000
committerjhb <jhb@FreeBSD.org>2011-08-26 17:08:22 +0000
commitc189a8585eba561c69434f90d30a71e897228236 (patch)
tree4e1041a6becbb834cd0252abd62d88f91d7030a3
parentfaaa2dc21f1a608ad5900b982c54b74851ba71b9 (diff)
downloadFreeBSD-src-c189a8585eba561c69434f90d30a71e897228236.zip
FreeBSD-src-c189a8585eba561c69434f90d30a71e897228236.tar.gz
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
-rw-r--r--sys/amd64/amd64/minidump_machdep.c1
-rw-r--r--sys/amd64/conf/NOTES8
-rw-r--r--sys/conf/options.amd641
3 files changed, 10 insertions, 0 deletions
diff --git a/sys/amd64/amd64/minidump_machdep.c b/sys/amd64/amd64/minidump_machdep.c
index 6b417f9..577de07 100644
--- a/sys/amd64/amd64/minidump_machdep.c
+++ b/sys/amd64/amd64/minidump_machdep.c
@@ -27,6 +27,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_pmap.h"
#include "opt_watchdog.h"
#include <sys/param.h>
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 4a47ace..07ea7b3 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -490,6 +490,14 @@ options ENABLE_ALART # Control alarm on Intel intpm driver
#
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
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 1bb60fe..87960d0 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -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
OpenPOWER on IntegriCloud