From nobody Fri Dec 19 14:21:15 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 1D7C72DF12F for ; Sat, 6 Dec 2025 21:42:04 +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=1765057326; cv=none; b=Ti8kBYveB3WDdwQfaVrGki5a1jT/YEE8X4fwEecNy2Pzjy1METgLCwz2Phq7o/upxCa6CaBqwSD/ClhJFyWJZ/8+S1VcHC9hYqGCdJzEHdgjWNI3RJDNaR7S1mOeBGfxLutFA92ueY++kVcpdDNZbfekQTP8qvY5rKGFdpCFsoA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765057326; c=relaxed/simple; bh=rx3sS67Yq7DspAm64dUKrB8hVXtz2HCFCQIMRqs0zu8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A8Dnhphj8BYsAG2R+7WclzgvSMVsEIpgGQ+adl9Yj+ymbRjEir9KkZyTS86WU9L8SfpD8VQAi/UJqphI+rpa42+HWi6vHq50OHmzao+CYV5Yv88Dm2Nyr8DD+mcPwPKsIJQx5hldyuQaxTeUwLLgR0mzk4lAdMfveaINaSK5Jvg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MUe2OEPX; 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="MUe2OEPX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8988AC116D0; Sat, 6 Dec 2025 21:42:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765057324; bh=rx3sS67Yq7DspAm64dUKrB8hVXtz2HCFCQIMRqs0zu8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MUe2OEPXANnRQHbiPfJ6vXPoZBqZUeUwMrPPkk4QOk41jcPN79v12sDgS0wFo+xa8 KDuEfuVlZ6I3ujDI4/FegwtuCYzPWG1lTGJIi19T7AtHigRb+06EF3AS19zWGJBNvA 2aFOZOt//5CsbaAXFSj3fUbgZhRLArN12TD89a8rLnylsSUyuTdgJFcleYhS0GJ0eO 7S3kZf8dkUcjnxHMcIo0lFwTYau6K/Q00BGQTiQxF1t9C8UZXgZZyw49orzTW4femw TJBSY9JgEvvlSL8SH9DUw2fjHYibSQRUZZi1E7yAzYjWQgqA/biDeBqaemPU3w5m4M TjNMaVp9UZNoA== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Linus Torvalds , Ingo Molnar , Peter Zijlstra , Borislav Petkov , Thomas Gleixner Subject: [PATCH 1/8] objtool: Rename ANNOTYPE_IGNORE_ALTS -> ANNOTYPE_IGNORE_ALTERNATIVE Date: Sat, 6 Dec 2025 13:41:08 -0800 Message-ID: X-Mailer: git-send-email 2.52.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" Rename ANNOTYPE_IGNORE_ALTS to ANNOTYPE_IGNORE_ALTERNATIVE for consistency with its corresponding ANNOTATE_IGNORE_ALTERNATIVE macro. Signed-off-by: Josh Poimboeuf --- include/linux/annotate.h | 4 ++-- include/linux/objtool_types.h | 2 +- tools/include/linux/objtool_types.h | 2 +- tools/objtool/check.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/annotate.h b/include/linux/annotate.h index 2f1599c9e573..929f5c658a1d 100644 --- a/include/linux/annotate.h +++ b/include/linux/annotate.h @@ -75,7 +75,7 @@ * objtool annotation to ignore the alternatives and only consider the ori= ginal * instruction(s). */ -#define ANNOTATE_IGNORE_ALTERNATIVE ASM_ANNOTATE(ANNOTYPE_IGNORE_ALTS) +#define ANNOTATE_IGNORE_ALTERNATIVE ASM_ANNOTATE(ANNOTYPE_IGNORE_ALTERNATI= VE) /* * This macro indicates that the following intra-function call is valid. * Any non-annotated intra-function call will cause objtool to issue a war= ning. @@ -116,7 +116,7 @@ #define ANNOTATE_RETPOLINE_SAFE ANNOTATE type=3DANNOTYPE_RETPOLINE_SAFE /* ANNOTATE_INSTR_BEGIN ANNOTATE type=3DANNOTYPE_INSTR_BEGIN */ /* ANNOTATE_INSTR_END ANNOTATE type=3DANNOTYPE_INSTR_END */ -#define ANNOTATE_IGNORE_ALTERNATIVE ANNOTATE type=3DANNOTYPE_IGNORE_ALTS +#define ANNOTATE_IGNORE_ALTERNATIVE ANNOTATE type=3DANNOTYPE_IGNORE_ALTERN= ATIVE #define ANNOTATE_INTRA_FUNCTION_CALL ANNOTATE type=3DANNOTYPE_INTRA_FUNCTI= ON_CALL #define ANNOTATE_UNRET_BEGIN ANNOTATE type=3DANNOTYPE_UNRET_BEGIN #define ANNOTATE_REACHABLE ANNOTATE type=3DANNOTYPE_REACHABLE diff --git a/include/linux/objtool_types.h b/include/linux/objtool_types.h index c6def4049b1a..e740002018c0 100644 --- a/include/linux/objtool_types.h +++ b/include/linux/objtool_types.h @@ -62,7 +62,7 @@ struct unwind_hint { #define ANNOTYPE_INSTR_BEGIN 3 #define ANNOTYPE_INSTR_END 4 #define ANNOTYPE_UNRET_BEGIN 5 -#define ANNOTYPE_IGNORE_ALTS 6 +#define ANNOTYPE_IGNORE_ALTERNATIVE 6 #define ANNOTYPE_INTRA_FUNCTION_CALL 7 #define ANNOTYPE_REACHABLE 8 #define ANNOTYPE_NOCFI 9 diff --git a/tools/include/linux/objtool_types.h b/tools/include/linux/objt= ool_types.h index c6def4049b1a..e740002018c0 100644 --- a/tools/include/linux/objtool_types.h +++ b/tools/include/linux/objtool_types.h @@ -62,7 +62,7 @@ struct unwind_hint { #define ANNOTYPE_INSTR_BEGIN 3 #define ANNOTYPE_INSTR_END 4 #define ANNOTYPE_UNRET_BEGIN 5 -#define ANNOTYPE_IGNORE_ALTS 6 +#define ANNOTYPE_IGNORE_ALTERNATIVE 6 #define ANNOTYPE_INTRA_FUNCTION_CALL 7 #define ANNOTYPE_REACHABLE 8 #define ANNOTYPE_NOCFI 9 diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 3f7999317f4d..53af6887852a 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -2358,7 +2358,7 @@ static int __annotate_early(struct objtool_file *file= , int type, struct instruct switch (type) { =20 /* Must be before add_special_section_alts() */ - case ANNOTYPE_IGNORE_ALTS: + case ANNOTYPE_IGNORE_ALTERNATIVE: insn->ignore_alts =3D true; break; =20 @@ -2439,7 +2439,7 @@ static int __annotate_late(struct objtool_file *file,= int type, struct instructi insn->unret =3D 1; break; =20 - case ANNOTYPE_IGNORE_ALTS: + case ANNOTYPE_IGNORE_ALTERNATIVE: /* early */ break; =20 --=20 2.52.0