x86/intel/spectre_v2: Remove unnecessary retp_compiler() test

... and the unneeded set of parenthesis.

Orabug: 28814570

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Mihai Carabas <mihai.carabas@oracle.com>
Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/arch/x86/kernel/cpu/bugs_64.c b/arch/x86/kernel/cpu/bugs_64.c
index 45b61d7b294307cc253cb6e304ae3e97629568c1..7f0252f8009b248af1c3bcb8d5a7bc129870eaa3 100644 (file)
--- 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);