Module Name: src
Committed By: reinoud
Date: Sun Aug 21 15:08:44 UTC 2011
Modified Files:
src/sys/arch/usermode/conf: GENERIC std.usermode
Log Message:
Move NKMEMPAGES from GENERIC to std.usermode and clarify the meaning of
MEMSIZE in the GENERIC kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/usermode/conf/GENERIC
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/usermode/conf/std.usermode
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/usermode/conf/GENERIC
diff -u src/sys/arch/usermode/conf/GENERIC:1.9 src/sys/arch/usermode/conf/GENERIC:1.10
--- src/sys/arch/usermode/conf/GENERIC:1.9 Fri Aug 12 12:59:13 2011
+++ src/sys/arch/usermode/conf/GENERIC Sun Aug 21 15:08:43 2011
@@ -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
Index: src/sys/arch/usermode/conf/std.usermode
diff -u src/sys/arch/usermode/conf/std.usermode:1.3 src/sys/arch/usermode/conf/std.usermode:1.4
--- src/sys/arch/usermode/conf/std.usermode:1.3 Sat Dec 29 20:21:01 2007
+++ src/sys/arch/usermode/conf/std.usermode Sun Aug 21 15:08:43 2011
@@ -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
