From fdb1b5e08929f21d29aedd447233b32f497b8999 Mon Sep 17 00:00:00 2001 From: Jonathan Corbet Date: Mon, 18 May 2020 06:19:25 -0600 Subject: [PATCH] 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 --- Documentation/admin-guide/sysctl/kernel.rst | 9 --------- kernel/sysctl.c | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst index 6b313b6d42d5..eb6bc9cc0318 100644 --- 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 2ba9f449d273..8a176d8727a3 100644 --- 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,