aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>1999-04-09 16:37:22 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>1999-04-09 16:37:22 +0000
commitb7ae5df2f88ae0e0cde3987d0fd180eb568cdb06 (patch)
tree1982d83aa4ef03853a9b5b96702e07d9525b2a03 /sys
parent7e123ddef251ddefbd1b358176492434aeddb9ca (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/options3
-rw-r--r--sys/conf/param.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/conf/options b/sys/conf/options
index 1aa1d94851df..0062c798b6cc 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-# $Id: options,v 1.121 1999/01/20 14:49:07 eivind Exp $
+# $Id: options,v 1.121.2.1 1999/02/08 19:05:55 des Exp $
#
# On the handling of kernel options
#
@@ -126,6 +126,7 @@ UNION
# Options used only in param.c.
HZ opt_param.h
+MAXFILES opt_param.h
MAXUSERS opt_param.h
MSGMNB opt_param.h
MSGMNI opt_param.h
diff --git a/sys/conf/param.c b/sys/conf/param.c
index ef98c59c6e25..d15e46398d86 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)param.c 8.3 (Berkeley) 8/20/94
- * $Id: param.c,v 1.31 1998/11/05 14:28:17 dg Exp $
+ * $Id: param.c,v 1.33 1999/04/09 16:28:11 des Exp $
*/
#include <stddef.h>
@@ -74,7 +74,9 @@ int hz = HZ;
int tick = 1000000 / HZ;
int tickadj = howmany(30000, 60 * HZ); /* can adjust 30ms in 60s */
#define NPROC (20 + 16 * MAXUSERS)
+#ifndef MAXFILES
#define MAXFILES (NPROC*2)
+#endif
int maxproc = NPROC; /* maximum # of processes */
int maxprocperuid = NPROC-1; /* maximum # of processes per user */
int maxfiles = MAXFILES; /* system wide open files limit */