diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-09-10 09:36:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-09-10 09:36:56 -0700 |
| commit | ad724d319c81475488794eccc11eb5e27242e1eb (patch) | |
| tree | 89a34a871f422f2e320eee99820218bc134cee34 /kernel | |
| parent | c9a8c0e393d6043fc29b0b527e654110ba523c36 (diff) | |
| parent | 353a95f1cd8da8a5436a3f070be07d2f484486cd (diff) | |
| download | linux-next-ad724d319c81475488794eccc11eb5e27242e1eb.tar.gz linux-next-ad724d319c81475488794eccc11eb5e27242e1eb.zip | |
Merge tag 'sysctl-7.03-fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl
Pull sysctl fix from Joel Granados:
"This fell through the cracks during the latest merge window. There are
no more CONFIG_PROC_SYSCTL uses after this fix:
- Replace CONFIG_PROC_SYSCTL with CONFIG_SYSCTL
CONFIG_SYSCTL is the config string that controls sysctl subsys"
* tag 'sysctl-7.03-fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl:
syscall_user_dispatch: Use CONFIG_SYSCTL for sysctl guard
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/entry/syscall_user_dispatch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/entry/syscall_user_dispatch.c b/kernel/entry/syscall_user_dispatch.c index 2002c7aae435..59c861866941 100644 --- a/kernel/entry/syscall_user_dispatch.c +++ b/kernel/entry/syscall_user_dispatch.c @@ -178,7 +178,7 @@ int syscall_user_dispatch_set_config(struct task_struct *task, unsigned long siz (char __user *)(uintptr_t)cfg.selector); } -#ifdef CONFIG_PROC_SYSCTL +#ifdef CONFIG_SYSCTL static const struct ctl_table syscall_user_dispatch_sysctls[] = { { .procname = "syscall_user_dispatch", @@ -195,4 +195,4 @@ static int __init syscall_user_dispatch_sysctl_init(void) return 0; } late_initcall(syscall_user_dispatch_sysctl_init); -#endif /* CONFIG_PROC_SYSCTL */ +#endif /* CONFIG_SYSCTL */ |