[PATCH 1/8] objtool: Rename ANNOTYPE_IGNORE_ALTS -> ANNOTYPE_IGNORE_ALTERNATIVE

[Josh Poimboeuf <jpoimboe@kernel.org>]

Rename ANNOTYPE_IGNORE_ALTS to ANNOTYPE_IGNORE_ALTERNATIVE for
consistency with its corresponding ANNOTATE_IGNORE_ALTERNATIVE macro.

Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
 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 original
  * instruction(s).
  */
-#define ANNOTATE_IGNORE_ALTERNATIVE	ASM_ANNOTATE(ANNOTYPE_IGNORE_ALTS)
+#define ANNOTATE_IGNORE_ALTERNATIVE	ASM_ANNOTATE(ANNOTYPE_IGNORE_ALTERNATIVE)
 /*
  * This macro indicates that the following intra-function call is valid.
  * Any non-annotated intra-function call will cause objtool to issue a warning.
@@ -116,7 +116,7 @@
 #define ANNOTATE_RETPOLINE_SAFE		ANNOTATE type=ANNOTYPE_RETPOLINE_SAFE
 /*	ANNOTATE_INSTR_BEGIN		ANNOTATE type=ANNOTYPE_INSTR_BEGIN */
 /*	ANNOTATE_INSTR_END		ANNOTATE type=ANNOTYPE_INSTR_END */
-#define ANNOTATE_IGNORE_ALTERNATIVE	ANNOTATE type=ANNOTYPE_IGNORE_ALTS
+#define ANNOTATE_IGNORE_ALTERNATIVE	ANNOTATE type=ANNOTYPE_IGNORE_ALTERNATIVE
 #define ANNOTATE_INTRA_FUNCTION_CALL	ANNOTATE type=ANNOTYPE_INTRA_FUNCTION_CALL
 #define ANNOTATE_UNRET_BEGIN		ANNOTATE type=ANNOTYPE_UNRET_BEGIN
 #define ANNOTATE_REACHABLE		ANNOTATE type=ANNOTYPE_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/objtool_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) {
 
 	/* Must be before add_special_section_alts() */
-	case ANNOTYPE_IGNORE_ALTS:
+	case ANNOTYPE_IGNORE_ALTERNATIVE:
 		insn->ignore_alts = true;
 		break;
 
@@ -2439,7 +2439,7 @@ static int __annotate_late(struct objtool_file *file, int type, struct instructi
 		insn->unret = 1;
 		break;
 
-	case ANNOTYPE_IGNORE_ALTS:
+	case ANNOTYPE_IGNORE_ALTERNATIVE:
 		/* early */
 		break;
 
-- 
2.52.0