diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-19 00:59:13 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-19 00:59:13 +0300 |
| commit | 2cb5c8683981ebd5033e3cc91f7dd75794f16e61 (patch) | |
| tree | 2f936bc7c34d77025826fa650ef8e764359c244c /ipc | |
| parent | bf3a69c6861ff4dc7892d895c87074af7bc1c400 (diff) | |
| parent | 4f1136a55dc8e2c27d51e934d0675e12331c7291 (diff) | |
| download | linux-2cb5c8683981ebd5033e3cc91f7dd75794f16e61.tar.xz | |
Merge tag 'sysctl-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl
Pull sysctl updates from Joel Granados:
"No functional changes - additional testing is required for the rest of
the pending changes.
- New shared repo for sysctl maintenance
- check-sysctl-docs adjustment for API changes by Thomas Weißschuh"
* tag 'sysctl-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl:
scripts: check-sysctl-docs: handle per-namespace sysctls
ipc: remove linebreaks from arguments of __register_sysctl_table
scripts: check-sysctl-docs: adapt to new API
MAINTAINERS: Update sysctl tree location
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_sysctl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c index 01c4a50d22b2..45cb1dabce29 100644 --- a/ipc/ipc_sysctl.c +++ b/ipc/ipc_sysctl.c @@ -292,8 +292,7 @@ bool setup_ipc_sysctls(struct ipc_namespace *ns) tbl[i].data = NULL; } - ns->ipc_sysctls = __register_sysctl_table(&ns->ipc_set, - "kernel", tbl, + ns->ipc_sysctls = __register_sysctl_table(&ns->ipc_set, "kernel", tbl, ARRAY_SIZE(ipc_sysctls)); } if (!ns->ipc_sysctls) { |