diff options
| author | Borislav Petkov (AMD) <bp@alien8.de> | 2023-07-28 23:03:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-08 20:04:52 +0200 |
| commit | 4974bd4b1385cc5b9cf7ae2e6dc62839800b6961 (patch) | |
| tree | e5e544717094cf6264ec5b46bade572583924ceb | |
| parent | b155f54a92b0c8fe62eb5b45d062613626428fc5 (diff) | |
| download | linux-stable-4974bd4b1385cc5b9cf7ae2e6dc62839800b6961.tar.gz linux-stable-4974bd4b1385cc5b9cf7ae2e6dc62839800b6961.tar.bz2 linux-stable-4974bd4b1385cc5b9cf7ae2e6dc62839800b6961.zip | |
x86/srso: Add a forgotten NOENDBR annotation
Upstream commit: 3bbbe97ad83db8d9df06daf027b0840188de625d
Fix:
vmlinux.o: warning: objtool: .export_symbol+0x29e40: data relocation to !ENDBR: srso_untrain_ret_alias+0x0
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/x86/lib/retpoline.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index 845cfb0d748f..2cff585f22f2 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -151,6 +151,7 @@ SYM_CODE_END(__x86_indirect_jump_thunk_array) .section .text.__x86.rethunk_untrain SYM_START(srso_untrain_ret_alias, SYM_L_GLOBAL, SYM_A_NONE) + ANNOTATE_NOENDBR ASM_NOP2 lfence jmp __x86_return_thunk |