| From 09ac167b74312df755b912092e1badf17b8f22f1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 26 Jan 2026 13:00:37 -0500 |
| Subject: tracing: Remove duplicate ENABLE_EVENT_STR and DISABLE_EVENT_STR |
| macros |
| |
| From: Steven Rostedt <rostedt@goodmis.org> |
| |
| [ Upstream commit 9df0e49c5b9b8d051529be9994e4f92f2d20be6f ] |
| |
| The macros ENABLE_EVENT_STR and DISABLE_EVENT_STR were added to trace.h so |
| that more than one file can have access to them, but was never removed |
| from their original location. Remove the duplicates. |
| |
| Cc: Masami Hiramatsu <mhiramat@kernel.org> |
| Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> |
| Cc: Tom Zanussi <zanussi@kernel.org> |
| Link: https://patch.msgid.link/20260126130037.4ba201f9@gandalf.local.home |
| Fixes: d0bad49bb0a09 ("tracing: Add enable_hist/disable_hist triggers") |
| Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| kernel/trace/trace_events.c | 5 ----- |
| 1 file changed, 5 deletions(-) |
| |
| diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c |
| index a3d7067eae654..284ea3c3f46a7 100644 |
| --- a/kernel/trace/trace_events.c |
| +++ b/kernel/trace/trace_events.c |
| @@ -3609,11 +3609,6 @@ void trace_put_event_file(struct trace_event_file *file) |
| EXPORT_SYMBOL_GPL(trace_put_event_file); |
| |
| #ifdef CONFIG_DYNAMIC_FTRACE |
| - |
| -/* Avoid typos */ |
| -#define ENABLE_EVENT_STR "enable_event" |
| -#define DISABLE_EVENT_STR "disable_event" |
| - |
| struct event_probe_data { |
| struct trace_event_file *file; |
| unsigned long count; |
| -- |
| 2.51.0 |
| |
