summaryrefslogtreecommitdiff
path: root/sys/compat/linux/linux_misc.c
diff options
context:
space:
mode:
authorPhilip Guenthe <guenther@cvs.openbsd.org>2012-04-10 15:50:53 +0000
committerPhilip Guenthe <guenther@cvs.openbsd.org>2012-04-10 15:50:53 +0000
commite8a9a9f2d6489645bf13279629f174fbbb51e5f2 (patch)
tree6c4388beca9c54cb18ca390586c38d8057a8a342 /sys/compat/linux/linux_misc.c
parent213c6b55ddb4168cc2df478c206d9f8db6bfac38 (diff)
Make the KERN_NPROCS and KERN_MAXPROC sysctl()s and the RLIMIT_NPROC rlimit
count processes instead of threads. New sysctl()s KERN_NTHREADS and KERN_MAXTHREAD count and limit threads. The nprocs and maxproc kernel variables are replaced by nprocess, maxprocess, nthreads, and maxthread. ok tedu@ mikeb@
Diffstat (limited to 'sys/compat/linux/linux_misc.c')
-rw-r--r--sys/compat/linux/linux_misc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 9d300d33a1e..544bfe72cde 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_misc.c,v 1.74 2012/03/23 15:51:26 guenther Exp $ */
+/* $OpenBSD: linux_misc.c,v 1.75 2012/04/10 15:50:52 guenther Exp $ */
/* $NetBSD: linux_misc.c,v 1.27 1996/05/20 01:59:21 fvdl Exp $ */
/*-
@@ -1437,7 +1437,7 @@ linux_sys_sysinfo(p, v, retval)
si.bufferram = bufpages * PAGE_SIZE;
si.totalswap = uvmexp.swpages * PAGE_SIZE;
si.freeswap = (uvmexp.swpages - uvmexp.swpginuse) * PAGE_SIZE;
- si.procs = nprocs;
+ si.procs = nthreads;
/* The following are only present in newer Linux kernels. */
si.totalbig = 0;
si.freebig = 0;