Received-SPF: pass (google.com: domain of linux-kernel+bounces-46259-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: John Garry <john.g.garry@oracle.com>
To: mcgrof@kernel.org, russ.weight@linux.dev, gregkh@linuxfoundation.org,
        rafael@kernel.org, rostedt@goodmis.org, mhiramat@kernel.org,
        mathieu.desnoyers@efficios.com, davem@davemloft.net,
        edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
        keescook@chromium.org, masahiroy@kernel.org, nathan@kernel.org,
        nicolas@fjasle.eu
Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
        netdev@vger.kernel.org, linux-kbuild@vger.kernel.org,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH RFC 2/4] tracing: Use uts_release
Date: Wed, 31 Jan 2024 10:48:49 +0000
Message-Id: <20240131104851.2311358-3-john.g.garry@oracle.com>
In-Reply-To: <20240131104851.2311358-1-john.g.garry@oracle.com>
References: <20240131104851.2311358-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?eGv73Lr9leCLY1S2aSLyX82fjpai5mA1sEDcLGvHKGu/kmFxUzlzgVL6wYl3?=
 =?us-ascii?Q?2FiqnSbrXA4pJx5/H8Y16oOxtYqI2/Vcq55hpAsED4CqpoaPdnQ9OpEqaxWV?=
 =?us-ascii?Q?JQ7MIgLP03g9DYH32vvZa4eDzgEK4B8wttTLg6u3y5/+o7S2zcN1dbcvJzgU?=
 =?us-ascii?Q?UmQmt7h3LOLXYrCDeJAd7/MZyfFU5ybqJ4QjZbSZb8s7CiLjCfyyKjQws9N6?=
 =?us-ascii?Q?MrX/bGiuDNVCfklO6nvFlxUEidEyG/6R5gJ6SgHBMk/6/V7KWLbBNTVV3EZU?=
 =?us-ascii?Q?eMhmEJHhXd+lU3rf5ea9n/EyDLRfcxpDB0LCMf5HMKo/agFIOuLLU/M9G/B0?=
 =?us-ascii?Q?Tra3kS5cQqgQyRcIJY5nCTYr/Pm8gpkP4DBlWUrZZGdSaBJNp3kKqV0Mxj/M?=
 =?us-ascii?Q?aCV8c9T662Si2ih/+qFdVSr4CdOsUIr9wjM7dHN+J8xXuf38hO43T4elSGhL?=
 =?us-ascii?Q?9zZytPjltPJFFN+CT8z2shJ3ATMFgARB0nF9Q/8bpQufrn5EwoG+S9zDwDuw?=
 =?us-ascii?Q?e2L7ahQ7ZBApIJSOoxbRNyXgTiSp5OV2505ejD/gEh+rEO/4diqpLFS4Pg4h?=
 =?us-ascii?Q?GHVwOmyrbhbyF3pZbLf7k2hloBHzB9a43B5IK9ljLvyNDwiJMh9NdoSiY60l?=
 =?us-ascii?Q?KptmaMWNRBFKyaVGJrm8Yy8wiq5Tcz4cRtK0EfXvH8JKS2pTQkbesOfM6gCS?=
 =?us-ascii?Q?Sx8TGd2HenZx3+G+Bbqnl2wTnPR5e7jOyGL3JBWgdDJKhJgkhytER5wKktp4?=
 =?us-ascii?Q?TaPpdNx+vQjI7v15diaNJysuOel+wYDQKymdc/pSHCtEASKg6l5v9q8oeqkL?=
 =?us-ascii?Q?XQkxyrDqN9WF2h0k4cCYYjEvXF7M+joYkulw6S7PZBYQSyHpsv+s+bAy8DXS?=
 =?us-ascii?Q?m2eR/2KSeFzGXsuapRRPHg4mb/6jrZbaS9ez8Pfspp5u76od5te2OU3P1Cik?=
 =?us-ascii?Q?297t2GTvpvnBzt7HKiz8RtQeMuCb6xAk3VOXrEQxhfMv5HSwffe/wBNKBDX9?=
 =?us-ascii?Q?mtGOyWtbXn9A1Nm1t/Rwhoqa6EFP6Izef53RyUtJv/kSfjHDf0zgzEIuyz3y?=
 =?us-ascii?Q?908l2HrluD+DwAjkw7Zt+TTGATIaYHhdR9Pdiy4MiLDaABjv2h639lIEawwb?=
 =?us-ascii?Q?oWcsyyhLs4vB3bEN15C6+zyzD3XOLiOz+BgUPRaJxwotVmHz/V8WM7NpGHg+?=
 =?us-ascii?Q?BTIojscpsDa22X1bWoB6rGKoQ1dLW1gvG4uuO0iYEarOvhwuR5IYAYykxOYF?=
 =?us-ascii?Q?KlecahJpeD+BRykU6tQE7xOfVEJqnm3YZicFDWOUuQyHoBwNDeW5Y+qAZicF?=
 =?us-ascii?Q?w8lpN2tvmq3Osx9FnwJg5RjOuevi5DjhlIIAgbfTwh2Mo3xa2QBcxdmzWTIQ?=
 =?us-ascii?Q?7nZa3RBdEd4Ldi9Te3UB2EaUXTH3RRZvxvTJP4ONYIrnxvqmeI9lmtikeaM+?=
 =?us-ascii?Q?UILZwYVObM6f4a9sjy7A93EqqU/wRELrPTyXxMHBw3ujpPORhn3XVD3ThUyX?=
 =?us-ascii?Q?wB1IKOwdPFNAaimVvq74UgDfVY/EYlyHm1WsEylOJmUmOJq/uhNq13X2Cf2H?=
 =?us-ascii?Q?IA3swo8u8EG8rlr9oFXIlaubgpugPoRe4CUSQlW9xoZj5i2TPdkgjo9lpAHQ?=
 =?us-ascii?Q?zg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	+/8DZ4AsvsWo4THif2O5UBeWbzmH19fUUM/n0F65Hq+tSqRNA0n5JCOf3vFNm94xGjJKUmk+xR8WW1kBq899wL0uGgGWm1PXNVFa2o54ucg2Vba5DRYSx9lnf2J2FpnqbaHruVuUxuTNwqkMSUW5JiL8nrQ7B/jJ6Il5KadXSZffsubEhEdMr+DmO+NK/NflVi5XxxR1MXb/Q06t56Voj4mkKFYRriYAajNR3lkeG+6LtJuXPc46OFqAvOLFgcSBNwtxQdAkLjGNJL75qUHdgsGZJIt+hsmLSTM3LcRUBfwFzJxbFFedQMgoJYiHdJSaDze/tosq4aB1nbchBuBDEecYwpdphCPX9R/ut7f/vkIdNKLQcIJCZGABBCYGxtteLG+qIeSWKyj/ODG4k27i0b4qF2fv2bKcM8gVi61xz/V8PPitCXwhIjAAg5Ft+XiGXbR27sMx2YdGjwulTGNSn1n9mXMR+EDA438kX59Czw+k89WHZ5NN/C1zAlxpe+Id0rFdF2eetiUja4SsScdOCw/qULpJM3k8StypThj/huKQaCym7FMz9O3OYi0pDFIysTvUeUdOkctsfHujLO6ahu1bqAl+NAn5n8U37JXYLNg=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 185c2e6e-9e4a-40dc-8fdb-08dc224a430b
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 10:49:12.8921
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: dXvjnRkkfyFDVWS7PlIgx5pvu8MvDJnpYySs6EH3C+LnKUcnnEX4YFsYB5M0zPLl5ja0R38UBf98P2XlvCXACA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB7323
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-01-31_05,2024-01-30_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 mlxscore=0
 spamscore=0 suspectscore=0 adultscore=0 mlxlogscore=999 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000
 definitions=main-2401310082
X-Proofpoint-GUID: fG4_O7z_NgJOY3bCFdhiHrtxY6Arv3ox
X-Proofpoint-ORIG-GUID: fG4_O7z_NgJOY3bCFdhiHrtxY6Arv3ox

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(-)

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 |"
-- 
2.35.3