From: Ross Zwisler <zwisler@chromium.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Ross Zwisler <zwisler@google.com>,
LKML <linux-kernel@vger.kernel.org>,
Linux Trace Kernel <linux-trace-kernel@vger.kernel.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
paulmck@kernel.org, Joel Fernandes <joel@joelfernandes.org>,
Tom Zanussi <zanussi@kernel.org>
Subject: [PATCH] tracing: remove unnecessary trace_trigger ifdef
Date: Thu, 8 Dec 2022 17:33:10 -0700 [thread overview]
Message-ID: <20221209003310.1737039-1-zwisler@google.com> (raw)
In-Reply-To: <20221208183945.1de18843@gandalf.local.home>
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@google.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
prev parent reply other threads:[~2022-12-09 0:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-21 1:00 [PATCH v2] tracing: Add trace_trigger kernel command line option Steven Rostedt
2022-12-08 22:27 ` Ross Zwisler
2022-12-08 23:39 ` Steven Rostedt
2022-12-09 0:19 ` Ross Zwisler
2022-12-09 5:29 ` Steven Rostedt
2022-12-09 0:33 ` Ross Zwisler [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221209003310.1737039-1-zwisler@google.com \
--to=zwisler@chromium.org \
--cc=akpm@linux-foundation.org \
--cc=joel@joelfernandes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=paulmck@kernel.org \
--cc=rostedt@goodmis.org \
--cc=zanussi@kernel.org \
--cc=zwisler@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®