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 <jpoimboe@kernel.org>
---
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.
*/
-#define ARCH_WARN_REACHABLE ANNOTATE_REACHABLE(1b)
+#define ARCH_WARN_REACHABLE ANNOTATE_REACHABLE_LABEL(1b)
#define __WARN_FLAGS(cond_str, flags) \
do { \
diff --git a/arch/x86/include/asm/irq_stack.h b/arch/x86/include/asm/irq_stack.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 @@
#define ASM_CALL_ARG0 \
"1: call %c[__func] \n" \
- ANNOTATE_REACHABLE(1b) " \n"
+ ANNOTATE_REACHABLE_LABEL(1b) " \n"
#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_REACHABLE)
+#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
--
2.52.0