1 files changed, 2 insertions, 15 deletions

diff --git a/arch/arm/mm/proc-v7-bugs.c b/arch/arm/mm/proc-v7-bugs.c
index 5544b82a2e7a..9a07916af8dd 100644
--- a/arch/arm/mm/proc-v7-bugs.c
+++ b/arch/arm/mm/proc-v7-bugs.c
@@ -52,8 +52,6 @@ static void cpu_v7_spectre_init(void)
         case ARM_CPU_PART_CORTEX_A17:
         case ARM_CPU_PART_CORTEX_A73:
         case ARM_CPU_PART_CORTEX_A75:
-                if (processor.switch_mm != cpu_v7_bpiall_switch_mm)
-                        goto bl_error;
                 per_cpu(harden_branch_predictor_fn, cpu) =
                         harden_branch_predictor_bpiall;
                 spectre_v2_method = "BPIALL";
@@ -61,8 +59,6 @@ static void cpu_v7_spectre_init(void)
 
         case ARM_CPU_PART_CORTEX_A15:
         case ARM_CPU_PART_BRAHMA_B15:
-                if (processor.switch_mm != cpu_v7_iciallu_switch_mm)
-                        goto bl_error;
                 per_cpu(harden_branch_predictor_fn, cpu) =
                         harden_branch_predictor_iciallu;
                 spectre_v2_method = "ICIALLU";
@@ -88,11 +84,9 @@ static void cpu_v7_spectre_init(void)
                                           ARM_SMCCC_ARCH_WORKAROUND_1, &res);
                         if ((int)res.a0 != 0)
                                 break;
-                        if (processor.switch_mm != cpu_v7_hvc_switch_mm && cpu)
-                                goto bl_error;
                         per_cpu(harden_branch_predictor_fn, cpu) =
                                 call_hvc_arch_workaround_1;
-                        processor.switch_mm = cpu_v7_hvc_switch_mm;
+                        cpu_do_switch_mm = cpu_v7_hvc_switch_mm;
                         spectre_v2_method = "hypervisor";
                         break;
 
@@ -101,11 +95,9 @@ static void cpu_v7_spectre_init(void)
                                           ARM_SMCCC_ARCH_WORKAROUND_1, &res);
                         if ((int)res.a0 != 0)
                                 break;
-                        if (processor.switch_mm != cpu_v7_smc_switch_mm && cpu)
-                                goto bl_error;
                         per_cpu(harden_branch_predictor_fn, cpu) =
                                 call_smc_arch_workaround_1;
-                        processor.switch_mm = cpu_v7_smc_switch_mm;
+                        cpu_do_switch_mm = cpu_v7_smc_switch_mm;
                         spectre_v2_method = "firmware";
                         break;
 
@@ -119,11 +111,6 @@ static void cpu_v7_spectre_init(void)
         if (spectre_v2_method)
                 pr_info("CPU%u: Spectre v2: using %s workaround\n",
                         smp_processor_id(), spectre_v2_method);
-        return;
-
-bl_error:
-        pr_err("CPU%u: Spectre v2: incorrect context switching function, system vulnerable\n",
-                cpu);
 }
 #else
 static void cpu_v7_spectre_init(void)