On Tue, 18 Feb 2025 10:56:20 +0100 Joel Granados <[email protected]> wrote:
> Squash with ftrace: > Move stac_tracer_enabled into trace_sysctl_table while keeping the > CONFIG_STACK_TRACER ifdef. 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 <[email protected]> > --- > kernel/sysctl.c | 10 ---------- > kernel/trace/trace.c | 9 +++++++++ > 2 files changed, 9 insertions(+), 10 deletions(-) > > diff --git a/kernel/sysctl.c b/kernel/sysctl.c > index baa250e223a2..dc3747cc72d4 100644 > --- a/kernel/sysctl.c > +++ b/kernel/sysctl.c > @@ -68,7 +68,6 @@ > > #ifdef CONFIG_X86 > #include <asm/nmi.h> > -#include <asm/stacktrace.h> > #include <asm/io.h> > #endif > #ifdef CONFIG_SPARC > @@ -1674,15 +1673,6 @@ static const struct ctl_table kern_table[] = { > .proc_handler = proc_dointvec, > }, > #endif > -#ifdef CONFIG_STACK_TRACER > - { > - .procname = "stack_tracer_enabled", > - .data = &stack_tracer_enabled, > - .maxlen = sizeof(int), > - .mode = 0644, > - .proc_handler = stack_trace_sysctl, > - }, > -#endif > #ifdef CONFIG_MODULES > { > .procname = "modprobe", > diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c > index abfc0e56173b..17b449f9e330 100644 > --- a/kernel/trace/trace.c > +++ b/kernel/trace/trace.c This should go into kernel/trace/trace_stack.c, and remove the #ifdef. -- Steve > @@ -166,6 +166,15 @@ static const struct ctl_table trace_sysctl_table[] = { > .mode = 0644, > .proc_handler = tracepoint_printk_sysctl, > }, > +#ifdef CONFIG_STACK_TRACER > + { > + .procname = "stack_tracer_enabled", > + .data = &stack_tracer_enabled, > + .maxlen = sizeof(int), > + .mode = 0644, > + .proc_handler = stack_trace_sysctl, > + }, > +#endif > }; > > static int __init init_trace_sysctls(void) >
