From nobody Fri Dec 19 14:22:47 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 1D84C2DF138 for ; Sat, 6 Dec 2025 21:42:05 +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=ML16uZ1d/s3HppVYIohcimhsoC70by0zAbzkxWoTziF38wKtAt5rgenOuUdiG87ZRSCe+KwxaGaKJ+xSN1LaGE2vBe2GcZulBdNih9B0WkM6dkzEL/8+9tUR4QU4Nx0fVzHcm2kBvKENZER0LNTNlgel2LV6j4S7uVWby/q0/cI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765057326; c=relaxed/simple; bh=BZgBfgaRvNl+NItRjbnd3VlFaLb6VPBUMQst8elTclI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FsnwK/2q70xB8faTMXMQh3udQBYGsKOadqUeNgzyQ+dQDo5purjOqMTFPHnMXnr7ohxe8FK7fQJFqvO/qmZfqYqSGq5+wpTJZnJmwM9UVZh5fCWa26KDXHFHIiDFDpwrBWDqoDmY9b1/4pnRLXCZnMTUViUbqPq8yEFuCy9h2v0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R5lxgTS5; 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="R5lxgTS5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64E04C113D0; 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=1765057325; bh=BZgBfgaRvNl+NItRjbnd3VlFaLb6VPBUMQst8elTclI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R5lxgTS5of/B4jHKnZWg/juzFI0I1BGCPMhJXcvoxeNl6O/ublOZOeEkTiVGZlzUu CjtmmUuq9APt4C3ZLF6tV4FtO0YLGK7PUazHdownQuRZduawzMdOiJaMkFFKz5xr1g hkRsjvDb8KWMW7zbCG/rT112aULHrkFw1prDBn2EbZsAtaTtVYbYgAkVnm1JQ9spXO 7cbhrQLt/5QHGX0fmd4JtOjGjkd3id3kpvBpsAdo2xHU8xwJHtYeNSkHloWX0CuVFx 3rKuSUT21tFsjl1upAw+r2aEjmby4Wjr/rIzvktrIMHWia6dHzME/83U6L3LbtZwoc n/g4KOtXDkAdA== 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 3/8] objtool: Rename C ANNOTATE_REACHABLE to ANNOTATE_REACHABLE_LABEL Date: Sat, 6 Dec 2025 13:41:10 -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 asm version, the C version of ANNOTATE_REACHABLE takes an argument. Rename it to ANNOTATE_REACHABLE_LABEL accordingly. Signed-off-by: Josh Poimboeuf --- arch/x86/include/asm/bug.h | 2 +- arch/x86/include/asm/irq_stack.h | 2 +- include/linux/annotate.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index ee23b98353d7..df170c2f1e24 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -125,7 +125,7 @@ do { \ * message out than not know about it. */ =20 -#define ARCH_WARN_REACHABLE ANNOTATE_REACHABLE(1b) +#define ARCH_WARN_REACHABLE ANNOTATE_REACHABLE_LABEL(1b) =20 #define __WARN_FLAGS(cond_str, flags) \ do { \ diff --git a/arch/x86/include/asm/irq_stack.h b/arch/x86/include/asm/irq_st= ack.h index 8325b79f2ac6..af4b10de3f9c 100644 --- a/arch/x86/include/asm/irq_stack.h +++ b/arch/x86/include/asm/irq_stack.h @@ -101,7 +101,7 @@ =20 #define ASM_CALL_ARG0 \ "1: call %c[__func] \n" \ - ANNOTATE_REACHABLE(1b) " \n" + ANNOTATE_REACHABLE_LABEL(1b) " \n" =20 #define ASM_CALL_ARG1 \ "movq %[arg1], %%rdi \n" \ diff --git a/include/linux/annotate.h b/include/linux/annotate.h index 929f5c658a1d..0ece31a9b585 100644 --- a/include/linux/annotate.h +++ b/include/linux/annotate.h @@ -94,7 +94,7 @@ * terminating, like a noreturn CALL or UD2 when we know they are not -- eg * WARN using UD2. */ -#define ANNOTATE_REACHABLE(label) ASM_ANNOTATE_LABEL(label, ANNOTYPE_REACH= ABLE) +#define ANNOTATE_REACHABLE_LABEL(label) ASM_ANNOTATE_LABEL(label, ANNOTYPE= _REACHABLE) /* * This should not be used; it annotates away CFI violations. There are a = few * valid use cases like kexec handover to the next kernel image, and there= is --=20 2.52.0