diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2023-08-14 13:44:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-26 13:26:59 +0200 |
| commit | 54dde78a50a8eb0d6a293c8416fcf6365d189af3 (patch) | |
| tree | e2b27558dd6663a7b8236ef548ccf457639bbb57 /tools | |
| parent | 44dbc912fd8a132f01eca8fc0928d6c9beb1f51c (diff) | |
| download | linux-54dde78a50a8eb0d6a293c8416fcf6365d189af3.tar.gz | |
x86/cpu: Rename original retbleed methods
commit d025b7bac07a6e90b6b98b487f88854ad9247c39 upstream. Rename the original retbleed return thunk and untrain_ret to retbleed_return_thunk() and retbleed_untrain_ret(). No functional changes. Suggested-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/20230814121148.909378169@infradead.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/objtool/arch/x86/decode.c | 2 | ||||
| -rw-r--r-- | tools/objtool/check.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c index 8d8bc07184ea..29c35279c7ed 100644 --- a/tools/objtool/arch/x86/decode.c +++ b/tools/objtool/arch/x86/decode.c @@ -799,5 +799,5 @@ bool arch_is_rethunk(struct symbol *sym) return !strcmp(sym->name, "__x86_return_thunk") || !strcmp(sym->name, "srso_untrain_ret") || !strcmp(sym->name, "srso_safe_ret") || - !strcmp(sym->name, "zen_return_thunk"); + !strcmp(sym->name, "retbleed_return_thunk"); } diff --git a/tools/objtool/check.c b/tools/objtool/check.c index c2c350933a23..8ec97762b607 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -1430,7 +1430,7 @@ static int add_jump_destinations(struct objtool_file *file) struct symbol *sym = find_symbol_by_offset(dest_sec, dest_off); /* - * This is a special case for zen_untrain_ret(). + * This is a special case for retbleed_untrain_ret(). * It jumps to __x86_return_thunk(), but objtool * can't find the thunk's starting RET * instruction, because the RET is also in the |