From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:57910 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752840AbdDRO0V (ORCPT ); Tue, 18 Apr 2017 10:26:21 -0400 Subject: Patch "Revert "ARM: 8457/1: psci-smp is built only for SMP"" has been added to the 3.18-stable tree To: amit.pundir@linaro.org, gregkh@linuxfoundation.org Cc: , From: Date: Tue, 18 Apr 2017 16:25:43 +0200 In-Reply-To: <1491458834-28498-1-git-send-email-amit.pundir@linaro.org> Message-ID: <1492525543205248@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled Revert "ARM: 8457/1: psci-smp is built only for SMP" to the 3.18-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-arm-8457-1-psci-smp-is-built-only-for-smp.patch and it can be found in the queue-3.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From amit.pundir@linaro.org Tue Apr 18 16:20:49 2017 From: Amit Pundir Date: Thu, 6 Apr 2017 11:37:14 +0530 Subject: Revert "ARM: 8457/1: psci-smp is built only for SMP" To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org Message-ID: <1491458834-28498-1-git-send-email-amit.pundir@linaro.org> From: Amit Pundir This reverts commit dbcfee724255ae171af51aaa56d8c5b78342adc9 which is commit be95485a0b8288a93402705730d3ea32f9f812b9 upstream. Upstream commit be95485 (ARM: 8457/1: psci-smp is built only for SMP) was intended to fix the build error for configs with CONFIG_SMP=n and CONFIG_ARM_PSCI=y, but it end up introducing a build error when cherry-picked on 3.18.y. This patch resulted in redefinition of psci_init() and broke the build for every build config in 3.18.y with CONFIG_SMP=n and CONFIG_ARM_PSCI=y. Signed-off-by: Amit Pundir Signed-off-by: Greg Kroah-Hartman --- arch/arm/include/asm/psci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -37,7 +37,7 @@ struct psci_operations { extern struct psci_operations psci_ops; extern struct smp_operations psci_smp_ops; -#if defined(CONFIG_SMP) && defined(CONFIG_ARM_PSCI) +#ifdef CONFIG_ARM_PSCI int psci_init(void); bool psci_smp_available(void); #else Patches currently in stable-queue which might be from amit.pundir@linaro.org are queue-3.18/revert-arm-8457-1-psci-smp-is-built-only-for-smp.patch