Merge branches 'acpi-scan', 'acpi-tad', 'acpi-extlog' and 'acpi-misc'

[linux-block.git] / tools / objtool / arch / x86 / decode.c

diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c
index 2d51fa8da9e8c3ceff90cc96fb16f9ddb79bd039..c0f25d00181ec27e06eb8e6d8fc094f6dea92fd5 100644 (file)
--- a/tools/objtool/arch/x86/decode.c
+++ b/tools/objtool/arch/x86/decode.c
@@ -824,8 +824,11 @@ bool arch_is_retpoline(struct symbol *sym)
 
 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, "__ret");
+       return !strcmp(sym->name, "__x86_return_thunk");
+}
+
+bool arch_is_embedded_insn(struct symbol *sym)
+{
+       return !strcmp(sym->name, "retbleed_return_thunk") ||
+              !strcmp(sym->name, "srso_safe_ret");
 }