svn commit: r205707 - in stable/7/sys: conf i386/conf i386/i386
John Baldwin
jhb at FreeBSD.org
Fri Mar 26 18:54:46 UTC 2010
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"
More information about the svn-src-stable-7
mailing list