Module Name: src
Committed By: snj
Date: Tue Nov 1 19:00:11 UTC 2016
Modified Files:
src/sys/arch/amd64/conf [netbsd-7]: std.xen
src/sys/arch/xen/conf [netbsd-7]: std.xen
Log Message:
Pull up following revision(s) (requested by joerg in ticket #1258):
sys/arch/amd64/conf/std.xen: revision 1.8
sys/arch/xen/conf/std.xen: revision 1.8
Use the same process and file limits as normal AND64 for Xen kernels.
Given Xen/i386 the same process and file limit as native i386.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.38.1 src/sys/arch/amd64/conf/std.xen
cvs rdiff -u -r1.7 -r1.7.28.1 src/sys/arch/xen/conf/std.xen
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/amd64/conf/std.xen
diff -u src/sys/arch/amd64/conf/std.xen:1.6 src/sys/arch/amd64/conf/std.xen:1.6.38.1
--- src/sys/arch/amd64/conf/std.xen:1.6 Wed Jul 29 12:02:05 2009
+++ src/sys/arch/amd64/conf/std.xen Tue Nov 1 19:00:11 2016
@@ -1,4 +1,4 @@
-# $NetBSD: std.xen,v 1.6 2009/07/29 12:02:05 cegger Exp $
+# $NetBSD: std.xen,v 1.6.38.1 2016/11/01 19:00:11 snj Exp $
# NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp
#
# standard, required NetBSD/i386 'options'
@@ -14,5 +14,8 @@ options EXEC_ELF64 # exec ELF binaries
options EXEC_SCRIPT # exec #! scripts
options MTRR
+options CHILD_MAX=1024 # 160 is too few
+options OPEN_MAX=1024 # 128 is too few
+
# Atheros HAL options
include "external/isc/atheros_hal/conf/std.ath_hal"
Index: src/sys/arch/xen/conf/std.xen
diff -u src/sys/arch/xen/conf/std.xen:1.7 src/sys/arch/xen/conf/std.xen:1.7.28.1
--- src/sys/arch/xen/conf/std.xen:1.7 Thu Jun 30 20:09:38 2011
+++ src/sys/arch/xen/conf/std.xen Tue Nov 1 19:00:11 2016
@@ -1,4 +1,4 @@
-# $NetBSD: std.xen,v 1.7 2011/06/30 20:09:38 wiz Exp $
+# $NetBSD: std.xen,v 1.7.28.1 2016/11/01 19:00:11 snj Exp $
# NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp
#
# standard, required NetBSD/i386 'options'
@@ -16,5 +16,8 @@ options CPU_IN_CKSUM
#options CRYPTO_MD_BF_ENC # machine-dependent code for BF_encrypt
#options CRYPTO_MD_BF_CBC # careful: uses bswapl, requires 486
+options CHILD_MAX=1024 # 160 is too few
+options OPEN_MAX=1024 # 128 is too few
+
# Atheros HAL options
include "external/isc/atheros_hal/conf/std.ath_hal"
