diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 1999-04-09 16:28:11 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 1999-04-09 16:28:11 +0000 |
| commit | 5a00f36414226a390bba7ec95705045a57393720 (patch) | |
| tree | 4c673bfd1163956aa155296f130731f2e556d0bd | |
| parent | 8b220a611d5f0fdbffd638eadf0f7dd836712b9b (diff) | |
Notes
| -rw-r--r-- | sys/conf/options | 3 | ||||
| -rw-r--r-- | sys/conf/param.c | 4 | ||||
| -rw-r--r-- | sys/kern/subr_param.c | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/sys/conf/options b/sys/conf/options index 8df554677fd3e..1458f2a648349 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -1,4 +1,4 @@ -# $Id: options,v 1.130 1999/03/17 01:48:34 mjacob Exp $ +# $Id: options,v 1.131 1999/04/08 17:58:07 n_hibma 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 ef98c59c6e253..ce003d93476cc 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.32 1998/12/14 08:34:54 dillon 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 */ diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index ef98c59c6e253..ce003d93476cc 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_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.32 1998/12/14 08:34:54 dillon 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 */ |