Skip to content

Commit 0a3c491

Browse files
jpoimboebp3tk0v
authored andcommitted
x86/rethunk: Use SYM_CODE_START[_LOCAL]_NOALIGN macros
Macros already exist for unaligned code block symbols. Use them. Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Acked-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/26d461bd509cc840af24c94586561c06d39812b2.1693889988.git.jpoimboe@kernel.org
1 parent 34a3cae commit 0a3c491

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

arch/x86/lib/retpoline.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ SYM_CODE_END(__x86_indirect_jump_thunk_array)
149149
* As a result, srso_alias_safe_ret() becomes a safe return.
150150
*/
151151
.pushsection .text..__x86.rethunk_untrain
152-
SYM_START(srso_alias_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE)
152+
SYM_CODE_START_NOALIGN(srso_alias_untrain_ret)
153153
UNWIND_HINT_FUNC
154154
ANNOTATE_NOENDBR
155155
ASM_NOP2
@@ -159,7 +159,7 @@ SYM_FUNC_END(srso_alias_untrain_ret)
159159
.popsection
160160

161161
.pushsection .text..__x86.rethunk_safe
162-
SYM_START(srso_alias_safe_ret, SYM_L_GLOBAL, SYM_A_NONE)
162+
SYM_CODE_START_NOALIGN(srso_alias_safe_ret)
163163
lea 8(%_ASM_SP), %_ASM_SP
164164
UNWIND_HINT_FUNC
165165
ANNOTATE_UNRET_SAFE
@@ -187,7 +187,7 @@ SYM_CODE_END(srso_alias_return_thunk)
187187
*/
188188
.align 64
189189
.skip 64 - (srso_safe_ret - srso_untrain_ret), 0xcc
190-
SYM_START(srso_untrain_ret, SYM_L_LOCAL, SYM_A_NONE)
190+
SYM_CODE_START_LOCAL_NOALIGN(srso_untrain_ret)
191191
ANNOTATE_NOENDBR
192192
.byte 0x48, 0xb8
193193

@@ -255,7 +255,7 @@ SYM_CODE_END(srso_return_thunk)
255255
*/
256256
.align 64
257257
.skip 64 - (retbleed_return_thunk - retbleed_untrain_ret), 0xcc
258-
SYM_START(retbleed_untrain_ret, SYM_L_LOCAL, SYM_A_NONE)
258+
SYM_CODE_START_LOCAL_NOALIGN(retbleed_untrain_ret)
259259
ANNOTATE_NOENDBR
260260
/*
261261
* As executed from retbleed_untrain_ret, this is:

0 commit comments

Comments
 (0)