Received-SPF: pass (google.com: domain of linux-kernel+bounces-76539-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: John Garry <john.g.garry@oracle.com>
To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com
Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH] tracing: Use init_utsname()->release
Date: Thu, 22 Feb 2024 12:46:39 +0000
Message-Id: <20240222124639.65629-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?BGFye7P2oNcQIwsfNC3TdXvqo7swLh1b/FJcwCdDDyT4OYhFp4J/CIxvRDGk?=
 =?us-ascii?Q?vfLb3bKkEW+IE7ZujlnYYDd/9dj4Xe3dnbOFE23X9Pw07c7DvuonJ+lrDAzv?=
 =?us-ascii?Q?9ij6nyp1WKuBkqVhfqTW5q7p3xXO3AkgsM4CrN5NRw21ofxjzCgA3RjAekMJ?=
 =?us-ascii?Q?os7sLIgiY1UUgSuVSD28kbyIclCubNr5/n6lEPqO+rrleEjvw4veMxXZBBO6?=
 =?us-ascii?Q?ocHhy7J+h26QUNftxapZHYhOboXkIhfsrZKha2xL1hW8EDlewg6uEvRYF285?=
 =?us-ascii?Q?PlJ1vZgeNB4u+Pjiam1J4LSc93se53muXv7bzpsz4A889PzseK87+sFnUowi?=
 =?us-ascii?Q?bmt1izNu4BcxqqwRXdPSHCH1iRBArwh1XdVy6t/mMk/yrYoA+wytb4kx2iDv?=
 =?us-ascii?Q?8e4lyCckBpphN6beAxz60ZhoHzEIi84lM1bkg4N8BtH/IJ8r0IVzfvbMsAYk?=
 =?us-ascii?Q?dLfCyHSw5bZFiKZ8hNs3FxgpyabWJijcF2mK38kxhMCBYjwDmkN/Q1u4u5Hu?=
 =?us-ascii?Q?eWSCCkZrrhYg5lBm4LsoNa7RZAp6tAtE/KNO6PTWQHXxBIBe8kxH8bSqMvE9?=
 =?us-ascii?Q?M8kZnUZy++D6vzci/I9yxKWZYUmnPKDkItBx6sLBDkxO5EOVFs8HlnljqTbS?=
 =?us-ascii?Q?pCl8Z4kToImd815yrqmEIiSO2LF5t5iGsWtGIju/5JM0K+iIlM0q7iPaTj+6?=
 =?us-ascii?Q?6CKt6xznS8+wSgjvi02JVq3xfgP9nyuT6Y4a6KBCmCd0NYUMFdKtVR3A14py?=
 =?us-ascii?Q?VgwlZAUfH4euvb8eVhye61nvCRjDpMKSTRiWFfFncFfgntcMOAFkASMibFTk?=
 =?us-ascii?Q?hvgKAEMcIvDNH8lwiGqNzvcbWuxh1QPSsJtCEJ1uUqqMeEWifzi8a9uTbtyu?=
 =?us-ascii?Q?0JEZdq/lhKKjYg2L/xq7Sf+pix8vqF55hDnYcjLxrpA4lrrpnhtYt+yPFx8D?=
 =?us-ascii?Q?wIDALZ1XT9vf/lOvPb2fkZUhq9wQ51k9BaAxcrcRkgg65VLRm2rq3JeFSkF5?=
 =?us-ascii?Q?PMzK/+tQj/a1PMqNAeNtV+DpkG2k52s8A/lpm8jXsfA10PEdU0Vq9QD4Ggsi?=
 =?us-ascii?Q?VPg1s5LA7p07eAt3ZAjVZ8+8EiBw1Po1NByyzZ1l3RiPjc4XiWlxIRPBk6r5?=
 =?us-ascii?Q?Z2IOq6aqqLzmpFrsxUC/qZI3bEYsQ6+4hQaYgxcgiRk+DoRmZbLlxRNonnLo?=
 =?us-ascii?Q?sHXdN5DMwL1NJKveT0Gj71UfIgkTh58SjhY9L4LHxGOym6aV2Yp9YdP1Kvem?=
 =?us-ascii?Q?uKEDmm+lgPv6Tva8MKN1idKcDaRw+paHDucgNC8YmyTyD7ckofqqYBnaUsIB?=
 =?us-ascii?Q?AL/YQphM89gUjyNV4aRf8Mm4+XHs8VeuPugasaxsVUGNtfKYQvDCj3HpAX3j?=
 =?us-ascii?Q?fpu4bxE8yvi4JuZ852baAkSmb/rmu3nzff5sbqEnEDNUuyG4HoD+qpTl70PO?=
 =?us-ascii?Q?jWehOG2tI9AjG5vI516EBpgBHRhxepLN4l+ai+ZvHMfvdtT/u981Uoq08xhL?=
 =?us-ascii?Q?116zTyKNf7BOOyyDkuLMl5liakDN3WuFZH3eKAMTIUJlZujfICVq42ECXUuW?=
 =?us-ascii?Q?0NQl/e5LFO4no+QezIzIlFBT1nGnfIh5MjtGf7m0i4qJtUuW/5+V/HpgAvbt?=
 =?us-ascii?Q?RQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	F5R7gvhfMDh6131q6pGelumM/tOfNaAV0bdHlyEBl+L06RHHQe6aCTwyyFU5G144ddKLnTijRsuQi6lBc5w0kieQ+t4cFCi9CpUIg4wAGWNpj9MIKplYij+2lEbG977BNcrPpsQx8lfuI6ia/pegqx3YU+NQ4m+mFmd/IknOtnznLFkDNX9pC0+q7ZgAXrmiRnKcZYS7ogtNDa3WP6/N4Bpbfp9dSX9IAFcfQPbV+fv3SGlvnhtG+yMbyMoKmXPK5QeXtsE5nB6UirM2fLw/WLyyJ7/PxxmOkUF+paXT6tA3pWCeFyvu00LmV4c3qArZFLp5B/Tgif+Dmbnt7fkNIDivEaPMF21Hso5CoUJIKtZ5ccQZnno0pofLcRI8mUrmneMv6uN8+E7pO9ozZf8jXJwNW3Z5+d893xxLxLBp2PrvE+khUT0zl+wpjMIyhdISfnZYMWAtp6bnKHxnFeue7MhhQMxaksuxtyu5ZQWPk11DSaRAbia+e3D9jGCbcWi7nfGPrN/ntrmUcNU+x0hF8cVOuS1b63e/4NJSw7zvQs795UgPqpMQTMjerlD8zz5JvG6/mQ7PaO84wS7vzOnE02w8vzMH2mdpp0dNkG+0NJ4=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0ddf2a6f-e6e5-409f-a42f-08dc33a45d83
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2024 12:47:01.7016
 (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: cCA+PebGhyJmBeYiBfg/5XS2q/QZZ5RnLT4t2j7CO198bVSv/rIh4dzz4ZGnAZigKawZGdh4+/n4+4+5SXM5ug==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7344
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-02-22_10,2024-02-22_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0
 phishscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 bulkscore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2402220102
X-Proofpoint-GUID: luCA6W6I-xr2ya8OfLSaUx2VAXm6fwQQ
X-Proofpoint-ORIG-GUID: luCA6W6I-xr2ya8OfLSaUx2VAXm6fwQQ

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.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
I originally sent an RFC using new string uts_release, but that
string is not needed as we can use init_utsname()->release instead.

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 8198bfc54b58..1416bf72f3f4 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>
@@ -4368,7 +4368,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.31.1