1 files changed, 25 insertions, 15 deletions

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index ac7e08886863..375b13f7e780 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -114,6 +114,11 @@ EXPORT_SYMBOL(elf_hwcap2);
 
 #ifdef MULTI_CPU
 struct processor processor __ro_after_init;
+#if defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR)
+struct processor *cpu_vtable[NR_CPUS] = {
+        [0] = &processor,
+};
+#endif
 #endif
 #ifdef MULTI_TLB
 struct cpu_tlb_fns cpu_tlb __ro_after_init;
@@ -666,28 +671,33 @@ static void __init smp_build_mpidr_hash(void)
 }
 #endif
 
-static void __init setup_processor(void)
+/*
+ * locate processor in the list of supported processor types.  The linker
+ * builds this table for us from the entries in arch/arm/mm/proc-*.S
+ */
+struct proc_info_list *lookup_processor(u32 midr)
 {
-        struct proc_info_list *list;
+        struct proc_info_list *list = lookup_processor_type(midr);
 
-        /*
-         * locate processor in the list of supported processor
-         * types.  The linker builds this table for us from the
-         * entries in arch/arm/mm/proc-*.S
-         */
-        list = lookup_processor_type(read_cpuid_id());
         if (!list) {
-                pr_err("CPU configuration botched (ID %08x), unable to continue.\n",
-                       read_cpuid_id());
-                while (1);
+                pr_err("CPU%u: configuration botched (ID %08x), CPU halted\n",
+                       smp_processor_id(), midr);
+                while (1)
+                /* can't use cpu_relax() here as it may require MMU setup */;
         }
 
+        return list;
+}
+
+static void __init setup_processor(void)
+{
+        unsigned int midr = read_cpuid_id();
+        struct proc_info_list *list = lookup_processor(midr);
+
         cpu_name = list->cpu_name;
         __cpu_architecture = __get_cpu_architecture();
 
-#ifdef MULTI_CPU
-        processor = *list->proc;
-#endif
+        init_proc_vtable(list->proc);
 #ifdef MULTI_TLB
         cpu_tlb = *list->tlb;
 #endif
@@ -699,7 +709,7 @@ static void __init setup_processor(void)
 #endif
 
         pr_info("CPU: %s [%08x] revision %d (ARMv%s), cr=%08lx\n",
-                cpu_name, read_cpuid_id(), read_cpuid_id() & 15,
+                list->cpu_name, midr, midr & 15,
                 proc_arch[cpu_architecture()], get_cr());
 
         snprintf(init_utsname()->machine, __NEW_UTS_LEN + 1, "%s%c",