Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
sysctl: rename kern_table -> sysctl_subsys_table
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>
+11
-12
-1
kernel/sys.c
-1
kernel/sys.c
+11
-11
kernel/sysctl.c
+11
-11
kernel/sysctl.c
···
1454
1454
return ret;
1455
1455
}
1456
1456
1457
-
static const struct ctl_table kern_table[] = {
1457
+
static const struct ctl_table sysctl_subsys_table[] = {
1458
1458
#ifdef CONFIG_PROC_SYSCTL
1459
1459
{
1460
1460
.procname = "sysctl_writes_strict",
···
1464
1464
.proc_handler = proc_dointvec_minmax,
1465
1465
.extra1 = SYSCTL_NEG_ONE,
1466
1466
.extra2 = SYSCTL_ONE,
1467
-
},
1468
-
#endif
1469
-
#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_ALLOW
1470
-
{
1471
-
.procname = "unaligned-trap",
1472
-
.data = &unaligned_enabled,
1473
-
.maxlen = sizeof (int),
1474
-
.mode = 0644,
1475
-
.proc_handler = proc_dointvec,
1476
1467
},
1477
1468
#endif
1478
1469
{
···
1480
1489
.mode = 0444,
1481
1490
.proc_handler = proc_dointvec,
1482
1491
},
1492
+
#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_ALLOW
1493
+
{
1494
+
.procname = "unaligned-trap",
1495
+
.data = &unaligned_enabled,
1496
+
.maxlen = sizeof(int),
1497
+
.mode = 0644,
1498
+
.proc_handler = proc_dointvec,
1499
+
},
1500
+
#endif
1483
1501
#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN
1484
1502
{
1485
1503
.procname = "ignore-unaligned-usertrap",
···
1502
1502
1503
1503
int __init sysctl_init_bases(void)
1504
1504
{
1505
-
register_sysctl_init("kernel", kern_table);
1505
+
register_sysctl_init("kernel", sysctl_subsys_table);
1506
1506
1507
1507
return 0;
1508
1508
}