From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Andrew Morton <akpm@linux-foundation.org>,
John Garry <john.g.garry@oracle.com>
Subject: [for-next][PATCH 05/13] tracing: Use init_utsname()->release
Date: Fri, 23 Feb 2024 09:18:43 -0500 [thread overview]
Message-ID: <20240223141902.230675644@goodmis.org> (raw)
In-Reply-To: 20240223141838.985298316@goodmis.org
From: John Garry <john.g.garry@oracle.com>
Instead of using UTS_RELEASE, use init_utsname()->release, which means that
we don't need to rebuild the code just for the git head commit changing.
Link: https://lore.kernel.org/linux-trace-kernel/20240222124639.65629-1-john.g.garry@oracle.com
Signed-off-by: John Garry <john.g.garry@oracle.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
kernel/trace/trace.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 8fdd68dbcf6d..f56b3275c676 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -13,7 +13,7 @@
* Copyright (C) 2004 Nadia Yvette Chambers
*/
#include <linux/ring_buffer.h>
-#include <generated/utsrelease.h>
+#include <linux/utsname.h>
#include <linux/stacktrace.h>
#include <linux/writeback.h>
#include <linux/kallsyms.h>
@@ -4133,7 +4133,7 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)
get_total_entries(buf, &total, &entries);
seq_printf(m, "# %s latency trace v1.1.5 on %s\n",
- name, UTS_RELEASE);
+ name, init_utsname()->release);
seq_puts(m, "# -----------------------------------"
"---------------------------------\n");
seq_printf(m, "# latency: %lu us, #%lu/%lu, CPU#%d |"
--
2.43.0
next prev parent reply other threads:[~2024-02-23 14:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-23 14:18 [for-next][PATCH 00/13] tracing: Updates for 6.9 Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 01/13] tracing/user_events: Prepare find/delete for same name events Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 02/13] tracing/user_events: Introduce multi-format events Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 03/13] selftests/user_events: Test " Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 04/13] tracing/user_events: Document multi-format flag Steven Rostedt
2024-02-23 14:18 ` Steven Rostedt [this message]
2024-02-23 14:18 ` [for-next][PATCH 06/13] NFSD: Fix nfsd_clid_class use of __string_len() macro Steven Rostedt
2024-02-23 14:36 ` Jeff Layton
2024-02-23 15:14 ` Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 07/13] drm/i915: Add missing ; to __assign_str() macros in tracepoint code Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 08/13] tracing: Rework __assign_str() and __string() to not duplicate getting the string Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 09/13] tracing: Do not calculate strlen() twice for __string() fields Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 10/13] tracing: Use ? : shortcut in trace macros Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 11/13] tracing: Use EVENT_NULL_STR macro instead of open coding "(null)" Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 12/13] tracing: Fix snapshot counter going between two tracers that use it Steven Rostedt
2024-02-23 14:18 ` [for-next][PATCH 13/13] tracing: Decrement the snapshot if the snapshot trigger fails to register 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=20240223141902.230675644@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=john.g.garry@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
/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