[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20221209003310.1737039-1-zwisler@google.com>
Date: Thu, 8 Dec 2022 17:33:10 -0700
From: Ross Zwisler <zwisler@...omium.org>
To: Steven Rostedt <rostedt@...dmis.org>
Cc: Ross Zwisler <zwisler@...gle.com>,
LKML <linux-kernel@...r.kernel.org>,
Linux Trace Kernel <linux-trace-kernel@...r.kernel.org>,
Masami Hiramatsu <mhiramat@...nel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Mathieu Desnoyers <mathieu.desnoyers@...icios.com>,
paulmck@...nel.org, Joel Fernandes <joel@...lfernandes.org>,
Tom Zanussi <zanussi@...nel.org>
Subject: [PATCH] tracing: remove unnecessary trace_trigger ifdef
The trace_trigger command line option introduced by
commit a01fdc897fa5 ("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.
Fixes: a01fdc897fa5 ("tracing: Add trace_trigger kernel command line option")
Signed-off-by: Ross Zwisler <zwisler@...gle.com>
---
kernel/trace/trace_events.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 3bfaf560ecc4..33e0b4f8ebe6 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -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
--
2.39.0.rc1.256.g54fd8350bd-goog
Powered by blists - more mailing lists