sysctl: Move sysctl_panic_on_stackoverflow to kernel/panic.c

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.

Reviewed-by: Kees Cook <kees@kernel.org>
Signed-off-by: Joel Granados <joel.granados@kernel.org>

diff --git a/kernel/panic.c b/kernel/panic.c
index 39e5b1ddf1a82a97cf9587c706bf9f77bd2dae6d..64e58835086d6773629c7378a0a8f5c79d64ac5b 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -183,6 +183,16 @@ static const struct ctl_table kern_panic_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_douintvec,
        },
+#if (defined(CONFIG_X86_32) || defined(CONFIG_PARISC)) && \
+       defined(CONFIG_DEBUG_STACKOVERFLOW)
+       {
+               .procname       = "panic_on_stackoverflow",
+               .data           = &sysctl_panic_on_stackoverflow,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec,
+       },
+#endif
 };
 
 static __init int kernel_panic_sysctls_init(void)

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index d5bebdd02cd4f1def7d9dd2b85454a9022b600b7..446d77ec44f57a4929389b64fc23d3b180f550b4 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1552,16 +1552,6 @@ static const struct ctl_table kern_table[] = {
                .mode           = 0444,
                .proc_handler   = proc_dointvec,
        },
-#if (defined(CONFIG_X86_32) || defined(CONFIG_PARISC)) && \
-       defined(CONFIG_DEBUG_STACKOVERFLOW)
-       {
-               .procname       = "panic_on_stackoverflow",
-               .data           = &sysctl_panic_on_stackoverflow,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec,
-       },
-#endif
 #ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN
        {
                .procname       = "ignore-unaligned-usertrap",