From: Arnd Bergmann <arnd@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Zheng Yejian <zhengyejian1@huawei.com>,
Vincent Donnefort <vdonnefort@google.com>,
Huang Yiwei <quic_hyiwei@quicinc.com>,
"Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>,
linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org
Subject: [PATCH] tracing/ring-buffer: hide unused last_boot_fops
Date: Fri, 19 Jul 2024 12:26:33 +0200 [thread overview]
Message-ID: <20240719102640.718554-1-arnd@kernel.org> (raw)
From: Arnd Bergmann <arnd@arndb.de>
This variable is used only in an #ifdef, which causes a W=1 warning
with some compilers:
kernel/trace/trace.c:7570:37: error: 'last_boot_fops' defined but not used [-Werror=unused-const-variable=]
7570 | static const struct file_operations last_boot_fops = {
Guard this one with the same #ifdef.
Fixes: 7a1d1e4b9639 ("tracing/ring-buffer: Add last_boot_info file to boot instance")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
Alternatively it could be marked as __maybe_unused, but I tried to follow
the style used in this file.
---
kernel/trace/trace.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 5462fb10ff64..6ab24213d496 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -6913,6 +6913,7 @@ tracing_total_entries_read(struct file *filp, char __user *ubuf,
return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
}
+#ifdef CONFIG_TRACER_SNAPSHOT
static ssize_t
tracing_last_boot_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos)
{
@@ -6927,6 +6928,7 @@ tracing_last_boot_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t
return simple_read_from_buffer(ubuf, cnt, ppos, buf, seq_buf_used(&seq));
}
+#endif
static int tracing_buffer_meta_open(struct inode *inode, struct file *filp)
{
@@ -7567,12 +7569,14 @@ static const struct file_operations trace_time_stamp_mode_fops = {
.release = tracing_single_release_tr,
};
+#ifdef CONFIG_TRACER_SNAPSHOT
static const struct file_operations last_boot_fops = {
.open = tracing_open_generic_tr,
.read = tracing_last_boot_read,
.llseek = generic_file_llseek,
.release = tracing_release_generic_tr,
};
+#endif
#ifdef CONFIG_TRACER_SNAPSHOT
static const struct file_operations snapshot_fops = {
--
2.39.2
next reply other threads:[~2024-07-19 10:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-19 10:26 Arnd Bergmann [this message]
2024-07-19 13:56 ` [PATCH] tracing/ring-buffer: hide unused last_boot_fops Steven Rostedt
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=20240719102640.718554-1-arnd@kernel.org \
--to=arnd@kernel.org \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=quic_hyiwei@quicinc.com \
--cc=rostedt@goodmis.org \
--cc=tz.stoyanov@gmail.com \
--cc=vdonnefort@google.com \
--cc=zhengyejian1@huawei.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;
as well as URLs for NNTP newsgroup(s).