From b0ee8e282e95cbc24e324cd3529de6b127147696 Mon Sep 17 00:00:00 2001 From: Andrea Righi Date: Wed, 10 Jan 2024 10:22:10 +0100 Subject: [PATCH] Revert "UBUNTU: SAUCE: apm -- annotate indirect calls within firmware_restrict_branch_speculation_{start,end}" BugLink: https://bugs.launchpad.net/bugs/2046440 Not needed anymore with the change to make objtool warnings as fatal errors for RETPOLINE and SLS. Signed-off-by: Andrea Righi --- arch/x86/include/asm/apm.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h index a7f2a7f57635..4d4015ddcf26 100644 --- a/arch/x86/include/asm/apm.h +++ b/arch/x86/include/asm/apm.h @@ -35,7 +35,6 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in, __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" "pushl %%ebp\n\t" - ANNOTATE_RETPOLINE_SAFE /* FRBS */ "lcall *%%cs:apm_bios_entry\n\t" "setc %%al\n\t" "popl %%ebp\n\t" @@ -60,7 +59,6 @@ static inline bool apm_bios_call_simple_asm(u32 func, u32 ebx_in, __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" "pushl %%ebp\n\t" - ANNOTATE_RETPOLINE_SAFE /* FRBS */ "lcall *%%cs:apm_bios_entry\n\t" "setc %%bl\n\t" "popl %%ebp\n\t"