Move print-fatal-signals into its own const ctl table array in kernel/signal.c. This is part of a greater effort to move ctl tables into their respective subsystems which will reduce the merge conflicts in kerenel/sysctl.c.
Signed-off-by: Joel Granados <joel.grana...@kernel.org> --- kernel/signal.c | 11 +++++++++++ kernel/sysctl.c | 8 -------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/kernel/signal.c b/kernel/signal.c index 875e97f6205a..347b74800f92 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -4962,9 +4962,20 @@ static const struct ctl_table signal_debug_table[] = { #endif }; +static const struct ctl_table signal_table[] = { + { + .procname = "print-fatal-signals", + .data = &print_fatal_signals, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, +}; + static int __init init_signal_sysctls(void) { register_sysctl_init("debug", signal_debug_table); + register_sysctl_init("kernel", signal_table); return 0; } early_initcall(init_signal_sysctls); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 7759b1ed7221..6514c13800a4 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -25,7 +25,6 @@ #include <linux/slab.h> #include <linux/sysctl.h> #include <linux/bitmap.h> -#include <linux/signal.h> #include <linux/printk.h> #include <linux/proc_fs.h> #include <linux/security.h> @@ -1626,13 +1625,6 @@ static const struct ctl_table kern_table[] = { .extra2 = SYSCTL_ONE, }, #endif - { - .procname = "print-fatal-signals", - .data = &print_fatal_signals, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, #ifdef CONFIG_SPARC { .procname = "reboot-cmd", -- 2.44.2