Commit 98629dad authored by Ross Zwisler's avatar Ross Zwisler Committed by Steven Rostedt (Google)

tracing: remove unnecessary trace_trigger ifdef

The trace_trigger command line option introduced by
commit a01fdc89 ("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: a01fdc89 ("tracing: Add trace_trigger kernel command line option")
Signed-off-by: default avatarRoss Zwisler <zwisler@google.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 88ca6a71
...@@ -2796,7 +2796,6 @@ trace_create_new_event(struct trace_event_call *call, ...@@ -2796,7 +2796,6 @@ trace_create_new_event(struct trace_event_call *call,
return file; return file;
} }
#ifdef CONFIG_HIST_TRIGGERS
#define MAX_BOOT_TRIGGERS 32 #define MAX_BOOT_TRIGGERS 32
static struct boot_triggers { static struct boot_triggers {
...@@ -2832,7 +2831,6 @@ static __init int setup_trace_triggers(char *str) ...@@ -2832,7 +2831,6 @@ static __init int setup_trace_triggers(char *str)
return 1; return 1;
} }
__setup("trace_trigger=", setup_trace_triggers); __setup("trace_trigger=", setup_trace_triggers);
#endif
/* Add an event to a trace directory */ /* Add an event to a trace directory */
static int static int
...@@ -2850,7 +2848,6 @@ __trace_add_new_event(struct trace_event_call *call, struct trace_array *tr) ...@@ -2850,7 +2848,6 @@ __trace_add_new_event(struct trace_event_call *call, struct trace_array *tr)
return event_define_fields(call); return event_define_fields(call);
} }
#ifdef CONFIG_HIST_TRIGGERS
static void trace_early_triggers(struct trace_event_file *file, const char *name) static void trace_early_triggers(struct trace_event_file *file, const char *name)
{ {
int ret; int ret;
...@@ -2868,9 +2865,6 @@ static void trace_early_triggers(struct trace_event_file *file, const char *name ...@@ -2868,9 +2865,6 @@ static void trace_early_triggers(struct trace_event_file *file, const char *name
bootup_triggers[i].event); 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 * Just create a descriptor for early init. A descriptor is required
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment