From ed9b9eeccf57be4d2aa90962d3edbb7833133022 Mon Sep 17 00:00:00 2001 From: Boris Ostrovsky Date: Wed, 21 Nov 2018 16:15:29 -0500 Subject: [PATCH] x86/intel/spectre_v2: Remove unnecessary retp_compiler() test ... and the unneeded set of parenthesis. Orabug: 28814570 Signed-off-by: Boris Ostrovsky Reviewed-by: Mihai Carabas Reviewed-by: Alexandre Chartre Reviewed-by: Darren Kenny Signed-off-by: Brian Maly --- arch/x86/kernel/cpu/bugs_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs_64.c b/arch/x86/kernel/cpu/bugs_64.c index 45b61d7b29430..7f0252f8009b2 100644 --- a/arch/x86/kernel/cpu/bugs_64.c +++ b/arch/x86/kernel/cpu/bugs_64.c @@ -771,8 +771,8 @@ static void __init spectre_v2_select_mitigation(void) * are forced to use retpoline on Skylake then use that. */ if (!retp_compiler() /* prefer IBRS over minimal ASM */ || - (retp_compiler() && !retpoline_selected(cmd) && - ((is_skylake_era() && use_ibrs_on_skylake)))) { + (!retpoline_selected(cmd) && + is_skylake_era() && use_ibrs_on_skylake)) { /* Start the engine! */ ibrs_select(&mode); -- 2.50.1