From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161762Ab3DENLu (ORCPT ); Fri, 5 Apr 2013 09:11:50 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:58371 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161612Ab3DENLs (ORCPT ); Fri, 5 Apr 2013 09:11:48 -0400 X-IronPort-AV: E=Sophos;i="4.87,414,1363132800"; d="scan'208";a="16891157" From: Stefano Stabellini To: CC: , , , , , , , Stefano Stabellini Subject: [PATCH v6 2/4] arm: prefer psci_smp_ops over mdesc->smp Date: Fri, 5 Apr 2013 14:11:33 +0100 Message-ID: <1365167495-18508-2-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If PSCI is available on the platform, prefer psci_smp_ops over the platform smp_ops. Signed-off-by: Stefano Stabellini --- 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