From nobody Fri Dec 19 14:22:44 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 1D6DE2DF125 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=boDHr0ftL9fV5pU8kYKbHs9lRp/g2L+d8zEqAHqIOP+iL3T5YwTxmWXHv7+b93nX8FbmMkmalVoa5GCho0gwIWSCsTM37bAX/pjtp81U6Ngvk3n1/FCdwLbjfi3jlMvk7Fb3RJfTqfoJ9t/rOzkcEW8C25otpx7EEHpuLmmQ2Ws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765057326; c=relaxed/simple; bh=KCb3t27KTQg9U4SvWb628Zc1/Mud1hf1SxxSl6w+L3E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZCqClWDwzncf6wElkxhDggkNU6sKv50S77Z9XcVVKRhlgDfbKroPOGyp2kYnv8VZgulZ7v9IWXqqyN4wUb3JStCf2HWsj7yghj9mR30F0sSt6XkfVY07hW0lG25mSxdjuNCmzfKZCoxIwyAcnZqQIg+EXgo4lSVwuVNqc/yZ5VU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bDaks2nj; 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="bDaks2nj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE311C4CEF5; 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=1765057325; bh=KCb3t27KTQg9U4SvWb628Zc1/Mud1hf1SxxSl6w+L3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bDaks2nj1+gOINtDswesT7SWexYFhrjw+Ka29dedkr8V/lUU7I6dU8yCXmPWFbin6 76PQDbJTKpTMr30DHgQp9Uht4weEyIgRuFekAL4dyG5Nu/qmcpCDFmlgH+mxrAU/Iu jrwhda2O50irweBIyTnsw1eGLzjBauRW4mlOS9W3s1puyE4P9w+A6i8die4mgFDf8G rQswQeqWGn847k7jkvtz8iS++a4VLKI6HZIeB/ROGqcBJgZbUh1p+ZPj9MYAjbpns0 i3TtRf5fgWSNRjI+WTofg1AtRd396a81I87pm4VmoafBMli3H81/RIoIv+uN7pkVpj FcFE7dGg6lsVg== 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 2/8] objtool: Make ANNOTYPE_DATA_SPECIAL unique across all annotations Date: Sat, 6 Dec 2025 13:41:09 -0800 Message-ID: <8681157420f2ce9cd82b4eda8eeec501bb5b133c.1765044697.git.jpoimboe@kernel.org> 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" While text annotations and data annotations are placed in separate sections, their underlying format (and creation macros) are the same. Use the same ANNOTYPE value space for both to reduce the possibility of clashes. Signed-off-by: Josh Poimboeuf --- include/linux/objtool_types.h | 3 +-- tools/include/linux/objtool_types.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/linux/objtool_types.h b/include/linux/objtool_types.h index e740002018c0..0b55dc386b69 100644 --- a/include/linux/objtool_types.h +++ b/include/linux/objtool_types.h @@ -66,7 +66,6 @@ struct unwind_hint { #define ANNOTYPE_INTRA_FUNCTION_CALL 7 #define ANNOTYPE_REACHABLE 8 #define ANNOTYPE_NOCFI 9 - -#define ANNOTYPE_DATA_SPECIAL 1 +#define ANNOTYPE_DATA_SPECIAL 10 =20 #endif /* _LINUX_OBJTOOL_TYPES_H */ diff --git a/tools/include/linux/objtool_types.h b/tools/include/linux/objt= ool_types.h index e740002018c0..0b55dc386b69 100644 --- a/tools/include/linux/objtool_types.h +++ b/tools/include/linux/objtool_types.h @@ -66,7 +66,6 @@ struct unwind_hint { #define ANNOTYPE_INTRA_FUNCTION_CALL 7 #define ANNOTYPE_REACHABLE 8 #define ANNOTYPE_NOCFI 9 - -#define ANNOTYPE_DATA_SPECIAL 1 +#define ANNOTYPE_DATA_SPECIAL 10 =20 #endif /* _LINUX_OBJTOOL_TYPES_H */ --=20 2.52.0