Revert "docs: sysctl/kernel: document ngroups_max"

This reverts commit 2f4c33063ad713e3a5b63002cf8362846e78bd71.

The changes here were fine, but there's a non-documentation change to
sysctl.c that makes messes elsewhere; those changes should have been done
independently.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>

diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst
index 6b313b6d42d567c10bcc684b66fad169e7f84afc..eb6bc9cc031863d351685bee83f5453c41eac445 100644 (file)
--- a/Documentation/admin-guide/sysctl/kernel.rst
+++ b/Documentation/admin-guide/sysctl/kernel.rst
@@ -517,15 +517,6 @@ Notes:
      successful IPC object allocation. If an IPC object allocation syscall
      fails, it is undefined if the value remains unmodified or is reset to -1.
 
-
-ngroups_max
-===========
-
-Maximum number of supplementary groups, _i.e._ the maximum size which
-``setgroups`` will accept. Exports ``NGROUPS_MAX`` from the kernel.
-
-
-
 nmi_watchdog
 ============
 

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 2ba9f449d2737acb07ac267252fb74f10ce0f7b7..8a176d8727a3ab8e12c4b48fe9ff7c3afdd97465 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -146,7 +146,7 @@ static unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
 static int maxolduid = 65535;
 static int minolduid;
 
-static const int ngroups_max = NGROUPS_MAX;
+static int ngroups_max = NGROUPS_MAX;
 static const int cap_last_cap = CAP_LAST_CAP;
 
 /*
@@ -883,7 +883,7 @@ static struct ctl_table kern_table[] = {
 #endif
        {
                .procname       = "ngroups_max",
-               .data           = (void *)&ngroups_max,
+               .data           = &ngroups_max,
                .maxlen         = sizeof (int),
                .mode           = 0444,
                .proc_handler   = proc_dointvec,