Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-24 06:01:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

tracing: remove unnecessary trace_trigger ifdef

Browse Source 
The trace_trigger command line option introduced by
commit a01fdc897f ("tracing: Add trace_trigger kernel command line option")
doesn't need to depend on the CONFIG_HIST_TRIGGERS kernel config option.

This code doesn't depend on the histogram code, and the run-time
selection of triggers is usable without CONFIG_HIST_TRIGGERS.

Link: https://lore.kernel.org/linux-trace-kernel/20221209003310.1737039-1-zwisler@google.com

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: Tom Zanussi <zanussi@kernel.org>
Fixes: a01fdc897f ("tracing: Add trace_trigger kernel command line option")
Signed-off-by: Ross Zwisler <zwisler@google.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
This commit is contained in:
Ross Zwisler 2022-12-08 17:33:10 -07:00 committed by Steven Rostedt (Google)
parent 88ca6a71dc
commit 98629dadcd
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/trace/trace_events.c
View File

@ -2796,7 +2796,6 @@ trace_create_new_event(struct trace_event_call *call,
return file;
}
#ifdef CONFIG_HIST_TRIGGERS
#define MAX_BOOT_TRIGGERS 32
static struct boot_triggers {
@ -2832,7 +2831,6 @@ static __init int setup_trace_triggers(char *str)
return 1;
}
__setup("trace_trigger=", setup_trace_triggers);
#endif
/* Add an event to a trace directory */
static int
@ -2850,7 +2848,6 @@ __trace_add_new_event(struct trace_event_call *call, struct trace_array *tr)
return event_define_fields(call);
}
#ifdef CONFIG_HIST_TRIGGERS
static void trace_early_triggers(struct trace_event_file *file, const char *name)
{
int ret;
@ -2868,9 +2865,6 @@ static void trace_early_triggers(struct trace_event_file *file, const char *name
bootup_triggers[i].event);
}
}
#else
static inline void trace_early_triggers(struct trace_event_file *file, const char *name) { }
#endif
/*
* Just create a descriptor for early init. A descriptor is required