x86/linkage: Fix padding for typed functions

CFI typed functions are failing to get padded properly for
CONFIG_CALL_PADDING.

Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/721f0da48d2a49fe907225711b8b76a2b787f9a8.1681331135.git.jpoimboe@kernel.org

diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h
index dd9b8118f7848e279cf1fec9247f814812e8ce5f..0953aa32a324aedbffb8826c0759508a13d52b54 100644 (file)
--- a/arch/x86/include/asm/linkage.h
+++ b/arch/x86/include/asm/linkage.h
@@ -99,7 +99,7 @@
 
 /* SYM_TYPED_FUNC_START -- use for indirectly called globals, w/ CFI type */
 #define SYM_TYPED_FUNC_START(name)                             \
-       SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)        \
+       SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_F_ALIGN)        \
        ENDBR
 
 /* SYM_FUNC_START -- use for global functions */