From patchwork Fri May 8 05:55:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 469878 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A81CA140773 for ; Fri, 8 May 2015 16:02:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751943AbbEHGCD (ORCPT ); Fri, 8 May 2015 02:02:03 -0400 Received: from goliath.siemens.de ([192.35.17.28]:55400 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751612AbbEHGCD (ORCPT ); Fri, 8 May 2015 02:02:03 -0400 X-Greylist: delayed 350 seconds by postgrey-1.27 at vger.kernel.org; Fri, 08 May 2015 02:02:02 EDT Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.14.3/8.14.3) with ESMTP id t485tUYL018809; Fri, 8 May 2015 07:55:30 +0200 Received: from md1f2u6c.ww002.siemens.net ([139.22.133.20]) by mail1.siemens.de (8.14.3/8.14.3) with SMTP id t485tTcT022446; Fri, 8 May 2015 07:55:30 +0200 From: Jan Kiszka To: Russell King , Thierry Reding Cc: linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, Stephen Warren Subject: [PATCH 1/2] ARM: Availability of psci_smp_available depends on CONFIG_SMP Date: Fri, 8 May 2015 07:55:26 +0200 Message-Id: <0f0a77ddee48027efa35f36d6c809d2d3ff91ce1.1431064527.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Ensure that we can use psci_smp_available without checking for CONFIG_SMP first. Signed-off-by: Jan Kiszka --- arch/arm/include/asm/psci.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index c25ef3e..eef6a0a 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -39,9 +39,13 @@ extern struct smp_operations psci_smp_ops; #ifdef CONFIG_ARM_PSCI int psci_init(void); -bool psci_smp_available(void); #else static inline int psci_init(void) { return 0; } +#endif + +#if defined(CONFIG_ARM_PSCI) && defined(CONFIG_SMP) +bool psci_smp_available(void); +#else static inline bool psci_smp_available(void) { return false; } #endif