latencytop: move sysctl to its own file

This moves latencytop sysctl to kernel/latencytop.c

Signed-off-by: liaohua <liaohua4@huawei.com>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>

diff --git a/include/linux/latencytop.h b/include/linux/latencytop.h
index abe3d95f795bf1bdfa5f33fb176f865a6eb13598..84f1053cf2a8b8669311e648199658134f30e6b0 100644 (file)
--- a/include/linux/latencytop.h
+++ b/include/linux/latencytop.h
@@ -38,9 +38,6 @@ account_scheduler_latency(struct task_struct *task, int usecs, int inter)
 
 void clear_tsk_latency_tracing(struct task_struct *p);
 
-int sysctl_latencytop(struct ctl_table *table, int write, void *buffer,
-               size_t *lenp, loff_t *ppos);
-
 #else
 
 static inline void

diff --git a/kernel/latencytop.c b/kernel/latencytop.c
index 166d7bf49666b0fa253a8a875839e640d70c05ee..76166df011a4db0aa01c0c3c73c047b0bb6ca1da 100644 (file)
--- a/kernel/latencytop.c
+++ b/kernel/latencytop.c
@@ -55,6 +55,7 @@
 #include <linux/sched/stat.h>
 #include <linux/list.h>
 #include <linux/stacktrace.h>
+#include <linux/sysctl.h>
 
 static DEFINE_RAW_SPINLOCK(latency_lock);
 
@@ -63,6 +64,31 @@ static struct latency_record latency_record[MAXLR];
 
 int latencytop_enabled;
 
+#ifdef CONFIG_SYSCTL
+static int sysctl_latencytop(struct ctl_table *table, int write, void *buffer,
+               size_t *lenp, loff_t *ppos)
+{
+       int err;
+
+       err = proc_dointvec(table, write, buffer, lenp, ppos);
+       if (latencytop_enabled)
+               force_schedstat_enabled();
+
+       return err;
+}
+
+static struct ctl_table latencytop_sysctl[] = {
+       {
+               .procname   = "latencytop",
+               .data       = &latencytop_enabled,
+               .maxlen     = sizeof(int),
+               .mode       = 0644,
+               .proc_handler   = sysctl_latencytop,
+       },
+       {}
+};
+#endif
+
 void clear_tsk_latency_tracing(struct task_struct *p)
 {
        unsigned long flags;
@@ -266,18 +292,9 @@ static const struct proc_ops lstats_proc_ops = {
 static int __init init_lstats_procfs(void)
 {
        proc_create("latency_stats", 0644, NULL, &lstats_proc_ops);
+#ifdef CONFIG_SYSCTL
+       register_sysctl_init("kernel", latencytop_sysctl);
+#endif
        return 0;
 }
-
-int sysctl_latencytop(struct ctl_table *table, int write, void *buffer,
-               size_t *lenp, loff_t *ppos)
-{
-       int err;
-
-       err = proc_dointvec(table, write, buffer, lenp, ppos);
-       if (latencytop_enabled)
-               force_schedstat_enabled();
-
-       return err;
-}
 device_initcall(init_lstats_procfs);

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index c0fdf465a93d0e44b558d661b15c5cb6b33d4b6b..b60345cbadf05672d48fd2ef063223698453d23f 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -64,7 +64,6 @@
 #include <linux/kexec.h>
 #include <linux/mount.h>
 #include <linux/userfaultfd_k.h>
-#include <linux/latencytop.h>
 #include <linux/pid.h>
 
 #include "../lib/kstrtox.h"
@@ -1623,15 +1622,6 @@ static struct ctl_table kern_table[] = {
                .extra1         = SYSCTL_NEG_ONE,
                .extra2         = SYSCTL_ONE,
        },
-#endif
-#ifdef CONFIG_LATENCYTOP
-       {
-               .procname       = "latencytop",
-               .data           = &latencytop_enabled,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = sysctl_latencytop,
-       },
 #endif
        {
                .procname       = "print-fatal-signals",