summaryrefslogtreecommitdiff
path: root/arch/x86/lib/error-inject.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/lib/error-inject.c')
-rw-r--r--arch/x86/lib/error-inject.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/lib/error-inject.c b/arch/x86/lib/error-inject.c
index be5b5fb1598b..512a2538596f 100644
--- a/arch/x86/lib/error-inject.c
+++ b/arch/x86/lib/error-inject.c
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
+#include <linux/linkage.h>
#include <linux/error-injection.h>
#include <linux/kprobes.h>
+#include <linux/objtool.h>
asmlinkage void just_return_func(void);
@@ -9,8 +11,10 @@ asm(
".text\n"
".type just_return_func, @function\n"
".globl just_return_func\n"
+ ASM_FUNC_ALIGN
"just_return_func:\n"
- " ret\n"
+ ANNOTATE_NOENDBR "\n"
+ ASM_RET
".size just_return_func, .-just_return_func\n"
);