torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

sysctl: rename kern_table -> sysctl_subsys_table

Browse Source 
Renamed sysctl table from kern_table to sysctl_subsys_table and grouped
the two arch specific ctls to the end of the array.

This is part of a greater effort to move ctl tables into their
respective subsystems which will reduce the merge conflicts in
kernel/sysctl.c.

Signed-off-by: Joel Granados <joel.granados@kernel.org>
This commit is contained in:
Joel Granados 2025-06-27 10:12:40 +02:00
parent 25ebbce1f1
commit 73184c8e4f
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/sys.c
View File

@ -210,7 +210,6 @@ static int __init init_overflow_sysctl(void)
postcore_initcall(init_overflow_sysctl); postcore_initcall(init_overflow_sysctl);
/* /*
* Returns true if current's euid is same as p's uid or euid, * Returns true if current's euid is same as p's uid or euid,
* or has CAP_SYS_NICE to p's user_ns. * or has CAP_SYS_NICE to p's user_ns.

22
kernel/sysctl.c
View File

@ -1454,7 +1454,7 @@ int proc_do_static_key(const struct ctl_table *table, int write,
return ret; return ret;
} }
static const struct ctl_table kern_table[] = { static const struct ctl_table sysctl_subsys_table[] = {
#ifdef CONFIG_PROC_SYSCTL #ifdef CONFIG_PROC_SYSCTL
{ {
.procname = "sysctl_writes_strict", .procname = "sysctl_writes_strict",
@ -1465,15 +1465,6 @@ static const struct ctl_table kern_table[] = {
.extra1 = SYSCTL_NEG_ONE, .extra1 = SYSCTL_NEG_ONE,
.extra2 = SYSCTL_ONE, .extra2 = SYSCTL_ONE,
}, },
#endif
#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_ALLOW
{
.procname = "unaligned-trap",
.data = &unaligned_enabled,
.maxlen = sizeof (int),
.mode = 0644,
.proc_handler = proc_dointvec,
},
#endif #endif
{ {
.procname = "ngroups_max", .procname = "ngroups_max",
@ -1489,6 +1480,15 @@ static const struct ctl_table kern_table[] = {
.mode = 0444, .mode = 0444,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_ALLOW
{
.procname = "unaligned-trap",
.data = &unaligned_enabled,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec,
},
#endif
#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN #ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN
{ {
.procname = "ignore-unaligned-usertrap", .procname = "ignore-unaligned-usertrap",
@ -1502,7 +1502,7 @@ static const struct ctl_table kern_table[] = {
int __init sysctl_init_bases(void) int __init sysctl_init_bases(void)
{ {
register_sysctl_init("kernel", kern_table); register_sysctl_init("kernel", sysctl_subsys_table);
return 0; return 0;
} }