| Message ID | 20240131104851.2311358-3-john.g.garry@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Introduce uts_release | expand |
On Wed, 31 Jan 2024 10:48:49 +0000 John Garry <john.g.garry@oracle.com> wrote: > Instead of using UTS_RELEASE, use uts_release, which means that we don't > need to rebuild the code just for the git head commit changing. > > Signed-off-by: John Garry <john.g.garry@oracle.com> Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org> -- Steve > --- > 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 2a7c6fd934e9..68513924beb4 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> > @@ -4354,7 +4354,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, uts_release); > seq_puts(m, "# -----------------------------------" > "---------------------------------\n"); > seq_printf(m, "# latency: %lu us, #%lu/%lu, CPU#%d |"
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 2a7c6fd934e9..68513924beb4 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> @@ -4354,7 +4354,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, uts_release); seq_puts(m, "# -----------------------------------" "---------------------------------\n"); seq_printf(m, "# latency: %lu us, #%lu/%lu, CPU#%d |"
Instead of using UTS_RELEASE, use uts_release, which means that we don't need to rebuild the code just for the git head commit changing. Signed-off-by: John Garry <john.g.garry@oracle.com> --- kernel/trace/trace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)