summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2022-08-16 13:29:54 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2022-08-16 13:29:54 +0000
commit03eec415a524963be760a5e1bde83615b0656c4f (patch)
treef5b9a9f84b866e8b02dcf14ce1d58be48b7cab5c
parent16b444cf4b4a8ade64699f8b5bd01c29834b48d7 (diff)
Remove obsolete kern.nselcoll sysctl.
OK millert@ deraadt@
-rw-r--r--lib/libc/sys/sysctl.29
-rw-r--r--sys/kern/kern_sysctl.c3
-rw-r--r--sys/sys/sysctl.h6
3 files changed, 6 insertions, 12 deletions
diff --git a/lib/libc/sys/sysctl.2 b/lib/libc/sys/sysctl.2
index 0e41e245b82..59f709ff5e9 100644
--- a/lib/libc/sys/sysctl.2
+++ b/lib/libc/sys/sysctl.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysctl.2,v 1.48 2022/03/31 17:27:16 naddy Exp $
+.\" $OpenBSD: sysctl.2,v 1.49 2022/08/16 13:29:52 visa Exp $
.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -27,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: March 31 2022 $
+.Dd $Mdocdate: August 16 2022 $
.Dt SYSCTL 2
.Os
.Sh NAME
@@ -460,7 +460,6 @@ information.
.It Dv KERN_NGROUPS Ta "integer" Ta "no"
.It Dv KERN_NOSUIDCOREDUMP Ta "integer" Ta "yes"
.It Dv KERN_NPROCS Ta "integer" Ta "no"
-.It Dv KERN_NSELCOLL Ta "integer" Ta "no"
.It Dv KERN_NTHREADS Ta "integer" Ta "no"
.It Dv KERN_NUMVNODES Ta "integer" Ta "no"
.It Dv KERN_OSRELEASE Ta "string" Ta "no"
@@ -716,10 +715,6 @@ Whether a process may dump core after changing user or group ID:
.El
.It Dv KERN_NPROCS Pq Va kern.nprocs
The number of entries in the kernel process table.
-.It Dv KERN_NSELCOLL Pq Va kern.nselcoll
-Number of
-.Xr select 2
-collisions.
.It Dv KERN_NTHREADS Pq Va kern.nthreads
The number of entries in the kernel thread table.
.It Dv KERN_NUMVNODES Pq Va kern.numvnodes
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 2e80e884871..1580409efeb 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_sysctl.c,v 1.405 2022/08/14 01:58:27 jsg Exp $ */
+/* $OpenBSD: kern_sysctl.c,v 1.406 2022/08/16 13:29:52 visa Exp $ */
/* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */
/*-
@@ -297,7 +297,6 @@ const struct sysctl_bounded_args kern_vars[] = {
{KERN_NFILES, &numfiles, SYSCTL_INT_READONLY},
{KERN_TTYCOUNT, &tty_count, SYSCTL_INT_READONLY},
{KERN_ARGMAX, &arg_max, SYSCTL_INT_READONLY},
- {KERN_NSELCOLL, &int_zero, SYSCTL_INT_READONLY},
{KERN_POSIX1, &posix_version, SYSCTL_INT_READONLY},
{KERN_NGROUPS, &ngroups_max, SYSCTL_INT_READONLY},
{KERN_JOB_CONTROL, &int_one, SYSCTL_INT_READONLY},
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index 0572c2f1fd0..174629da4b1 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysctl.h,v 1.228 2022/05/13 15:32:00 claudio Exp $ */
+/* $OpenBSD: sysctl.h,v 1.229 2022/08/16 13:29:53 visa Exp $ */
/* $NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $ */
/*
@@ -144,7 +144,7 @@ struct ctlname {
#define KERN_CPTIME 40 /* array: cp_time */
#define KERN_NCHSTATS 41 /* struct: vfs cache statistics */
#define KERN_FORKSTAT 42 /* struct: fork statistics */
-#define KERN_NSELCOLL 43 /* int: select(2) collisions */
+/* was KERN_NSELCOLL 43 */
#define KERN_TTY 44 /* node: tty information */
#define KERN_CCPU 45 /* int: ccpu */
#define KERN_FSCALE 46 /* int: fscale */
@@ -237,7 +237,7 @@ struct ctlname {
{ "cp_time", CTLTYPE_STRUCT }, \
{ "nchstats", CTLTYPE_STRUCT }, \
{ "forkstat", CTLTYPE_STRUCT }, \
- { "nselcoll", CTLTYPE_INT }, \
+ { "gap", 0 }, \
{ "tty", CTLTYPE_NODE }, \
{ "ccpu", CTLTYPE_INT }, \
{ "fscale", CTLTYPE_INT }, \