Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S942837AbdDTHHz (ORCPT ); Thu, 20 Apr 2017 03:07:55 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:45862 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941824AbdDTGhU (ORCPT ); Thu, 20 Apr 2017 02:37:20 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Amit Pundir Subject: [PATCH 3.18 014/124] Revert "ARM: 8457/1: psci-smp is built only for SMP" Date: Thu, 20 Apr 2017 08:34:49 +0200 Message-Id: <20170420063557.557198260@linuxfoundation.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170420063557.021306233@linuxfoundation.org> References: <20170420063557.021306233@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1190 Lines: 36 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ 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