Merge branch 'rk_develop-3.10' into rk_develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / kernel / setup.c

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index d4d020178d773425bae9ced72e6b16d6b19b3c52..e0ae7b52f4f0d8aa95dc04e65b0df7b4994b24e7 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -835,10 +835,12 @@ void __init setup_arch(char **cmdline_p)
        psci_init();
 #ifdef CONFIG_SMP
        if (is_smp()) {
-               if (psci_smp_available())
-                       smp_set_ops(&psci_smp_ops);
-               else if (mdesc->smp)
-                       smp_set_ops(mdesc->smp);
+               if (!mdesc->smp_init || !mdesc->smp_init()) {
+                       if (psci_smp_available())
+                               smp_set_ops(&psci_smp_ops);
+                       else if (mdesc->smp)
+                               smp_set_ops(mdesc->smp);
+               }
                smp_init_cpus();
        }
 #endif
@@ -923,6 +925,10 @@ static int c_show(struct seq_file *m, void *v)
        int i, j;
        u32 cpuid;
 
+#ifdef CONFIG_ARCH_ROCKCHIP
+       seq_printf(m, "Processor\t: %s rev %d (%s)\n",
+                  cpu_name, read_cpuid_id() & 15, elf_platform);
+#endif
        for_each_online_cpu(i) {
                /*
                 * glibc reads /proc/cpuinfo to determine the number of