[PATCH 2/8] objtool: Make ANNOTYPE_DATA_SPECIAL unique across all annotations

[Josh Poimboeuf <jpoimboe@kernel.org>]

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 <jpoimboe@kernel.org>
---
 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
 
 #endif /* _LINUX_OBJTOOL_TYPES_H */
diff --git a/tools/include/linux/objtool_types.h b/tools/include/linux/objtool_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
 
 #endif /* _LINUX_OBJTOOL_TYPES_H */
-- 
2.52.0