diff options
| author | kib <kib@FreeBSD.org> | 2015-10-05 05:33:30 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-10-05 05:33:30 +0000 |
| commit | b41e3ae634f137394311a216bc3c937d27e3bccd (patch) | |
| tree | c5c75b0b09697a68aff12d70bc6d192db6e7e7b6 /sys/kern | |
| parent | 30cb993101124752de7f100bed28ba945a3427ce (diff) | |
| download | FreeBSD-src-b41e3ae634f137394311a216bc3c937d27e3bccd.zip FreeBSD-src-b41e3ae634f137394311a216bc3c937d27e3bccd.tar.gz | |
MFC r288068:
Ensure that maxproc does not exceed pid_max, at the time of boot.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_param.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index 25927f7..5786e90 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$"); #define NBUF 0 #endif #ifndef MAXFILES -#define MAXFILES (maxproc * 2) +#define MAXFILES (40 + 32 * maxusers) #endif static int sysctl_kern_vm_guest(SYSCTL_HANDLER_ARGS); @@ -261,6 +261,8 @@ init_param2(long physpages) TUNABLE_INT_FETCH("kern.maxproc", &maxproc); if (maxproc > (physpages / 12)) maxproc = physpages / 12; + if (maxproc > pid_max) + maxproc = pid_max; maxprocperuid = (maxproc * 9) / 10; /* |
