On Fri, 5 Apr 2013, Stefano Stabellini wrote:
> If PSCI is available on the platform, prefer psci_smp_ops over the
> platform smp_ops.
>
> Signed-off-by: Stefano Stabellini <stefano.stabell...@eu.citrix.com>
Acked-by: Nicolas Pitre <n...@linaro.org>
> ---
> 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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
