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:03:51 +0200 |
| commit | 77cf32d0dbfbf575fe66561e069228c532dc1da9 (patch) | |
| tree | 977456561e5d5aae47a907f1a2320cdfeb5f69be | |
| parent | c7f2cd04554259c2474c4f9fa134528bc2826b22 (diff) | |
| download | linux-77cf32d0dbfbf575fe66561e069228c532dc1da9.tar.gz | |
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 764c7ed079f2..30e76fab678a 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -94,6 +94,7 @@ SYM_CODE_END(__x86_indirect_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 |