From nobody Fri Dec 19 14:22:50 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 5902F2E1C65 for ; Sat, 6 Dec 2025 21:42:06 +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=1765057327; cv=none; b=H2Rl0WGR1C+3a/E3Mo8MjJJ9ok+ZdyhpqS6lkRZry7e3oXbFE0C/0/caoQyPooerBOb9O6CnKQiSNGq12GITOmsR+oKBvev/n4cmDthtBFxIUITZdeO2tEj+hXAKe+DIm8UX6Lt9SuQyR21iEQxsD1uYDHYPssys/qyPdbYvf7U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765057327; c=relaxed/simple; bh=dlLUs+jIKhpIGRuYpSDnNyG97Y6Vbta+owwmYJ36q4s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fJcvGxCXOX5A0jao2uAsP8qdBP/f84nUh66Yed5+cQooSjn5xPWhf3Xnmp57Cyn5Z54rr5hjqLbokn1uiC0EqU/ncL8YfjNqpbsWDBELOq7M9RMYp7+SX5j8IqLjZYbEmc+CfKxXSbPnSzdyXffPGBbaN8UvXud5JjAQn4Y4MVI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Qljm9Pe4; 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="Qljm9Pe4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA61AC19423; Sat, 6 Dec 2025 21:42:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765057326; bh=dlLUs+jIKhpIGRuYpSDnNyG97Y6Vbta+owwmYJ36q4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qljm9Pe4qMVWHzbXQnOv+9fhDrjDobSSIpngx8AaeEOdJlcVG8sxIvqyJBk7V/Slk Uzwzl1FaIaas84hqWN9HXuM+HLO/xW/3aUNRbHzVZuH2zZPTl2ldoaukJYJcZsy1bF Lc2PUeYWb+iRQqUMZMC38/cNgeholCtJlmEXgxiaVOADRlS6cZfjKioFNSgWKMcUXN yOjoO8Rf1/wxu7uBKDQfoJgaMl+k4cq56THp2tBxwsO2Ezqe8icS/EBwQibwWbnqOI 4BvOwWQosEa+NjA8193c1JVHpdbK4uaSuJ93cSyJDz2q+XF26J5uIj5l76CFD0Y7qY uNlsgKmVd68Wg== 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 4/8] objtool: Rename asm ANNOTATE_NOCFI_SYM to ANNOTATE_NOCFI Date: Sat, 6 Dec 2025 13:41:11 -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" Unlike the C version, the asm version of ANNOTATE_NOCFI_SYM doesn't take an argument. Rename it to ANNOTATE_NOCFI accordingly. Signed-off-by: Josh Poimboeuf --- arch/x86/platform/efi/efi_stub_64.S | 2 +- include/linux/annotate.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/ef= i_stub_64.S index f0a5fba0717e..5aac37d379ab 100644 --- a/arch/x86/platform/efi/efi_stub_64.S +++ b/arch/x86/platform/efi/efi_stub_64.S @@ -14,7 +14,7 @@ SYM_FUNC_START(__efi_call) /* * The EFI code doesn't have any CFI, annotate away the CFI violation. */ - ANNOTATE_NOCFI_SYM + ANNOTATE_NOCFI pushq %rbp movq %rsp, %rbp and $~0xf, %rsp diff --git a/include/linux/annotate.h b/include/linux/annotate.h index 0ece31a9b585..1678410efa1b 100644 --- a/include/linux/annotate.h +++ b/include/linux/annotate.h @@ -120,7 +120,7 @@ #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 -#define ANNOTATE_NOCFI_SYM ANNOTATE type=3DANNOTYPE_NOCFI +#define ANNOTATE_NOCFI ANNOTATE type=3DANNOTYPE_NOCFI #define ANNOTATE_DATA_SPECIAL ANNOTATE_DATA type=3DANNOTYPE_DATA_SPECIAL #endif /* __ASSEMBLY__ */ =20 --=20 2.52.0