From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f49.google.com ([209.85.220.49]:34353 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755289AbcBXOgZ (ORCPT ); Wed, 24 Feb 2016 09:36:25 -0500 Received: by mail-pa0-f49.google.com with SMTP id fy10so13602848pac.1 for ; Wed, 24 Feb 2016 06:36:24 -0800 (PST) Subject: Re: patch to fix psci_smp_avaliable build error To: "gregkh@linuxfoundation.org" , Arnd Bergmann References: <56C67AB8.8020605@linaro.org> Cc: Mark Brown , stable@vger.kernel.org, Linaro Kernel From: Alex Shi Message-ID: <56CDBFE4.3040906@linaro.org> Date: Wed, 24 Feb 2016 22:36:20 +0800 MIME-Version: 1.0 In-Reply-To: <56C67AB8.8020605@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org List-ID: Ping. On 02/19/2016 10:15 AM, Alex Shi wrote: > > This patch is needed on lts 4.4 for the same build error. Could you like to pick it up? > > Regards > Alex > --------- > commit be95485a0b8288a93402705730d3ea32f9f812b9 > Author: Arnd Bergmann > Date: Thu Nov 19 15:03:57 2015 +0100 > > ARM: 8457/1: psci-smp is built only for SMP > > The PSCI SMP implementation is built only when both CONFIG_SMP and > CONFIG_ARM_PSCI are set, so a configuration that has the latter > but not the former can get a link error when it tries to call > psci_smp_available(). > > arch/arm/mach-tegra/built-in.o: In function `tegra114_cpuidle_init': > cpuidle-tegra114.c:(.init.text+0x52a): undefined reference to `psci_smp_available' > > This corrects the #ifdef in the psci.h header file to match the > Makefile conditional we have for building that function. > > Signed-off-by: Arnd Bergmann > Signed-off-by: Russell King > > diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h > index 68ee3ce..b4c6d99 100644 > --- a/arch/arm/include/asm/psci.h > +++ b/arch/arm/include/asm/psci.h > @@ -16,7 +16,7 @@ > > extern struct smp_operations psci_smp_ops; > > -#ifdef CONFIG_ARM_PSCI > +#if defined(CONFIG_SMP) && defined(CONFIG_ARM_PSCI) > bool psci_smp_available(void); > #else > static inline bool psci_smp_available(void) { return false; } >