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 <andrea.righi@canonical.com>
This commit is contained in:
Andrea Righi
2024-01-10 10:22:10 +01:00
committed by Paolo Pisati
parent 3852ab8400
commit b0ee8e282e
-2
View File
@@ -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"