| From | Stefano Stabellini <> | Subject | [PATCH v6 2/4] arm: prefer psci_smp_ops over mdesc->smp | Date | Fri, 5 Apr 2013 14:11:33 +0100 |
| |
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> --- arch/arm/kernel/setup.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 341efaa..dad3048 100644 --- 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 -- 1.7.2.5
|