diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-14 01:16:44 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-14 01:16:44 +0300 |
commit | 8fa37a68359d2d5dc16deeb5b09d64c9833c0674 (patch) | |
tree | 6fce4f8b4dd18520f2ff25edb1af4a69e8611b81 /kernel/sysctl.c | |
parent | 3ba2c3ff98ea8bfb219288dbacf2a23a902c751b (diff) | |
parent | 0dff89c4488f90c01807d9c12023433703206523 (diff) | |
download | linux-8fa37a68359d2d5dc16deeb5b09d64c9833c0674.tar.xz |
Merge tag 'sysctl-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux
Pull sysctl updates from Luis Chamberlain:
"Only a small step forward on the sysctl cleanups for this cycle"
* tag 'sysctl-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux:
sched: Move numa_balancing sysctls to its own file
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index c6d9dec11b74..a4d8e19e231a 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1633,25 +1633,6 @@ int proc_do_static_key(struct ctl_table *table, int write, } static struct ctl_table kern_table[] = { -#ifdef CONFIG_NUMA_BALANCING - { - .procname = "numa_balancing", - .data = NULL, /* filled in by handler */ - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = sysctl_numa_balancing, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_FOUR, - }, - { - .procname = "numa_balancing_promote_rate_limit_MBps", - .data = &sysctl_numa_balancing_promote_rate_limit, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ZERO, - }, -#endif /* CONFIG_NUMA_BALANCING */ { .procname = "panic", .data = &panic_timeout, |