[tip: x86/core] x86/error_inject: Align function properly
From: tip-bot2 for Peter Zijlstra
Date: Mon Oct 17 2022 - 10:59:08 EST
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 1934dc9a8a92fda36ab80cfd55edab1708dcdf9a
Gitweb: https://git.kernel.org/tip/1934dc9a8a92fda36ab80cfd55edab1708dcdf9a
Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
AuthorDate: Thu, 15 Sep 2022 13:10:49 +02:00
Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
CommitterDate: Mon, 17 Oct 2022 16:40:59 +02:00
x86/error_inject: Align function properly
Ensure inline asm functions are consistently aligned with compiler
generated and SYM_FUNC_START*() functions.
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20220915111143.930201368@xxxxxxxxxxxxx
---
arch/x86/lib/error-inject.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/lib/error-inject.c b/arch/x86/lib/error-inject.c
index 1e3de07..b5a6d83 100644
--- a/arch/x86/lib/error-inject.c
+++ b/arch/x86/lib/error-inject.c
@@ -11,6 +11,7 @@ asm(
".text\n"
".type just_return_func, @function\n"
".globl just_return_func\n"
+ ASM_FUNC_ALIGN
"just_return_func:\n"
ANNOTATE_NOENDBR
ASM_RET