mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 21:03:32 +00:00
x86/srso: Move retbleed IBPB check into existing 'has_microcode' code block
Simplify the code flow a bit by moving the retbleed IBPB check into the existing 'has_microcode' block. Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Acked-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/0a22b86b1f6b07f9046a9ab763fc0e0d1b7a91d4.1693889988.git.jpoimboe@kernel.org
This commit is contained in:
parent
0a0ce0da7f
commit
351236947a
1 changed files with 1 additions and 3 deletions
|
@ -2430,10 +2430,8 @@ static void __init srso_select_mitigation(void)
|
|||
setup_force_cpu_cap(X86_FEATURE_SRSO_NO);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (retbleed_mitigation == RETBLEED_MITIGATION_IBPB) {
|
||||
if (has_microcode) {
|
||||
if (retbleed_mitigation == RETBLEED_MITIGATION_IBPB) {
|
||||
srso_mitigation = SRSO_MITIGATION_IBPB;
|
||||
goto out;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue