From nobody Tue Dec 16 12:37:05 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC54A25F993; Fri, 9 May 2025 20:17:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746821868; cv=none; b=rLqANfR8PPjLgCBDHhTa9gSNKwUPmzX93xZbXsfTDyck2HDRalcr1XZHeUBHPL7qOT/OUfwzK9ABf3fs1TGf/ORVEy1MuC/BYAIYS0hAxCTYUy88GSulbsckRWpS1KSMr4UhN1xcsZHbmp6A0sZjFgsopObDjmKRXq+5DEawelg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746821868; c=relaxed/simple; bh=3DCMHlXEkaRnvAyL0pRaZ+Z/6H4tZRgc5zFZ9hxwIjY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rxco0rXThG/Cu6Cx1FRzfpsBVvKNOrlxsnnGoWlVw63KFcXcWoJ2+dIehAysOB9UikMzuvja83wSR1Byvq8vRwZRjz40hRD6MmmWSYZE5depMKXXvlgGPCB5ViLYp0/Aw7/t8HfICkw93E7NzDZBQ5N6i0iBLgABwwQApfMxv04= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BSNPsosT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BSNPsosT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D252DC4CEF4; Fri, 9 May 2025 20:17:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746821867; bh=3DCMHlXEkaRnvAyL0pRaZ+Z/6H4tZRgc5zFZ9hxwIjY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BSNPsosT0X5Rrpd3GpV03Wf1lDsBOTd1U+y2oWlG88xzwDDhVBTUd1W0i51jwXfT7 xS7631jfxOs50kznyakE5HG45Wjxz1CktlNMZ7YGkE8Pet/fEewbNP1LITq63v580w /Y0ux1kF6eFbinlcqt2xM/cTDaEw9numldGT03pMInvEZdTAlqBtIMw7GCX4w+gIBY 98Buhv+VdfEq5Wo6FSDe98I9SUr0esPJXq9zbEiQ+m9mKwiQapsl0Eezdt3KFZ5mgF 8C5BeckBcjWy9v+apE6+uyPK7rryAbuQgFyo7epT9Lg0lcvwTb5KWQZjYankwJD99F Qg6LeieCPuMrA== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Petr Mladek , Miroslav Benes , Joe Lawrence , live-patching@vger.kernel.org, Song Liu , laokz , Jiri Kosina , Marcos Paulo de Souza , Weinan Liu , Fazla Mehrab , Chen Zhongjin , Puranjay Mohan Subject: [PATCH v2 05/62] compiler: Tweak __UNIQUE_ID() naming Date: Fri, 9 May 2025 13:16:29 -0700 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In preparation for the objtool klp diff subcommand, add an underscore between the name and the counter. This will make it possible for objtool to distinguish between the non-unique and unique parts of the symbol name so it can properly correlate the symbols. Signed-off-by: Josh Poimboeuf --- include/linux/compiler.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 27725f1ab5ab..0efcfa6dab0f 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -163,7 +163,11 @@ void ftrace_likely_update(struct ftrace_likely_data *f= , int val, __asm__ ("" : "=3Dr" (var) : "0" (var)) #endif =20 -#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNT= ER__) +/* Format: __UNIQUE_ID__<__COUNTER__> */ +#define __UNIQUE_ID(name) \ + __PASTE(__UNIQUE_ID_, \ + __PASTE(name, \ + __PASTE(_, __COUNTER__))) =20 /** * data_race - mark an expression as containing intentional data races --=20 2.49.0