arm: prefer psci_smp_ops over mdesc->smp

If PSCI is available on the platform, prefer psci_smp_ops over the
platform smp_ops.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 341efaa7563119fd287cd9531a2b07ec82f01423..dad30488d110769da9416775777d7343613b4088 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -770,10 +770,10 @@ void __init setup_arch(char **cmdline_p)
        psci_init();
 #ifdef CONFIG_SMP
        if (is_smp()) {
-               if (mdesc->smp)
-                       smp_set_ops(mdesc->smp);
-               else if (psci_smp_available())
+               if (psci_smp_available())
                        smp_set_ops(&psci_smp_ops);
+               else if (mdesc->smp)
+                       smp_set_ops(mdesc->smp);
                smp_init_cpus();
        }
 #endif