Unlike the C version, the asm version of ANNOTATE_NOCFI_SYM doesn't take
an argument. Rename it to ANNOTATE_NOCFI accordingly.
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
arch/x86/platform/efi/efi_stub_64.S | 2 +-
include/linux/annotate.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
index f0a5fba0717e..5aac37d379ab 100644
--- a/arch/x86/platform/efi/efi_stub_64.S
+++ b/arch/x86/platform/efi/efi_stub_64.S
@@ -14,7 +14,7 @@ SYM_FUNC_START(__efi_call)
/*
* The EFI code doesn't have any CFI, annotate away the CFI violation.
*/
- ANNOTATE_NOCFI_SYM
+ ANNOTATE_NOCFI
pushq %rbp
movq %rsp, %rbp
and $~0xf, %rsp
diff --git a/include/linux/annotate.h b/include/linux/annotate.h
index 0ece31a9b585..1678410efa1b 100644
--- a/include/linux/annotate.h
+++ b/include/linux/annotate.h
@@ -120,7 +120,7 @@
#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
-#define ANNOTATE_NOCFI_SYM ANNOTATE type=ANNOTYPE_NOCFI
+#define ANNOTATE_NOCFI ANNOTATE type=ANNOTYPE_NOCFI
#define ANNOTATE_DATA_SPECIAL ANNOTATE_DATA type=ANNOTYPE_DATA_SPECIAL
#endif /* __ASSEMBLY__ */
--
2.52.0