[src/trunk]: src/sys/arch/usermode/conf Move NKMEMPAGES from GENERIC to std.u...

[reinoud <reinoud%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f4f7c4060125
branches:  trunk
changeset: 768587:f4f7c4060125
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Sun Aug 21 15:08:43 2011 +0000

description:
Move NKMEMPAGES from GENERIC to std.usermode and clarify the meaning of
MEMSIZE in the GENERIC kernel.

diffstat:

 sys/arch/usermode/conf/GENERIC      |  8 +++-----
 sys/arch/usermode/conf/std.usermode |  6 +++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (51 lines):

diff -r 171ef295979f -r f4f7c4060125 sys/arch/usermode/conf/GENERIC
--- a/sys/arch/usermode/conf/GENERIC    Sun Aug 21 15:06:41 2011 +0000
+++ b/sys/arch/usermode/conf/GENERIC    Sun Aug 21 15:08:43 2011 +0000
@@ -1,15 +1,15 @@
-# $NetBSD: GENERIC,v 1.9 2011/08/12 12:59:13 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.10 2011/08/21 15:08:43 reinoud Exp $
 
 include "arch/usermode/conf/std.usermode"
 
 options        INCLUDE_CONFIG_FILE
-#ident                 "GENERIC-$Revision: 1.9 $"
+#ident                 "GENERIC-$Revision: 1.10 $"
 maxusers       32
 
 makeoptions    DEBUG="-g3"
 
 #options       MEMSIZE=65536   # amount of memory to allocate (in KB)
-options        MEMSIZE=131072
+options        MEMSIZE=131072  # amount of memory to use for userland (in KB)
 
 options        RTC_OFFSET=0
 options        KTRACE
@@ -23,8 +23,6 @@
 #options       DIAGNOSTIC
 #options       LOCKDEBUG
 
-options                NKMEMPAGES=256
-
 options        COMPAT_BSDPTY
 options        COMPAT_50
 
diff -r 171ef295979f -r f4f7c4060125 sys/arch/usermode/conf/std.usermode
--- a/sys/arch/usermode/conf/std.usermode       Sun Aug 21 15:06:41 2011 +0000
+++ b/sys/arch/usermode/conf/std.usermode       Sun Aug 21 15:08:43 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.usermode,v 1.3 2007/12/29 20:21:01 reinoud Exp $
+# $NetBSD: std.usermode,v 1.4 2011/08/21 15:08:43 reinoud Exp $
 
 machine usermode
 include "conf/std"
@@ -8,6 +8,10 @@
 options        EXEC_ELF64
 options        EXEC_SCRIPT
 
+# Defaults
+options                NKMEMPAGES=256
+#options               NKMEMPAGES_MAX_DEFAULT=2048
+
 defflag opt_xen.h      DO_NOT_DEFINE
 defflag opt_kernbase.h DO_NOT_DEFINE2
 defflag opt_noredzone.h        DO_NOT_DEFINE3