From owner-svn-src-all@FreeBSD.ORG Fri Sep 16 18:36:44 2011 Return-Path: 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 0A207106564A; Fri, 16 Sep 2011 18:36:44 +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 D3D698FC14; Fri, 16 Sep 2011 18:36:43 +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 p8GIahZo033729; Fri, 16 Sep 2011 18:36:43 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8GIahoB033725; Fri, 16 Sep 2011 18:36:43 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201109161836.p8GIahoB033725@svn.freebsd.org> From: John Baldwin Date: Fri, 16 Sep 2011 18:36:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225626 - in stable/8/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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Sep 2011 18:36:44 -0000 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 __FBSDID("$FreeBSD$"); +#include "opt_pmap.h" #include "opt_watchdog.h" #include 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