From patchwork Thu Apr 6 06:07:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96908 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp585360qgd; Wed, 5 Apr 2017 23:07:22 -0700 (PDT) X-Received: by 10.98.219.2 with SMTP id f2mr33923835pfg.23.1491458841877; Wed, 05 Apr 2017 23:07:21 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o20si757751pgn.288.2017.04.05.23.07.21; Wed, 05 Apr 2017 23:07:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755084AbdDFGHU (ORCPT + 6 others); Thu, 6 Apr 2017 02:07:20 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:35234 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752699AbdDFGHT (ORCPT ); Thu, 6 Apr 2017 02:07:19 -0400 Received: by mail-pg0-f49.google.com with SMTP id 81so26253574pgh.2 for ; Wed, 05 Apr 2017 23:07:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=MWsvgIJcIsa0v3uqAFFZMcu1UiuwqMJXzwSJnEki+IE=; b=dihKuoq+nXPFCYLFNJfw4S6jEJoPEd6yDUUxuQFPp8AJbrX6CQU+niRZ2ewEjBzzv9 g+IPLy3OjSXukflj5iLYVwnIc52KpeYuswz3snKUdaHQiexAmYJ+mjOdPWiaE/iTLy7O CfNaBOB2e4IQR2vngpprY+1q452UQONjz27gc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=MWsvgIJcIsa0v3uqAFFZMcu1UiuwqMJXzwSJnEki+IE=; b=WJCs8rE09tO27EbUyig9qUrRUGhaDI/N2XGFA2KlPpzsJU2ctJKFbEeyj8/lqtm1in h5uqOIJs+6o9sYL0gAU3pTsxexpvIJZdCopxiBbwkUz5kRLvvGVywDyWb7jpY8gBV429 QpYo4pGt2JTsUtm24lfzY749qHhVxxbwXR7NG8Bh9Lu2lv09yZFl70ecIF+On/dWc3Hc WevqIQGSVcYtkE2i3KidqrvjW8roiM0NNwKjbtaoSEG6xqyXSCyAwstlOBV2MVYnXbrH AiniIHG/HZzBICYfRkCfVDaYT72gNVpfUQh8+yLw6ugDpfftLE9EM/y2rm2m5cH78/dd AK9w== X-Gm-Message-State: AFeK/H2myW4OnF0BRFJEbvZd9PjIDWyOUIa5FLCvP3FK9rOQCnr8eIckDliLWg0ByMLBGDxS X-Received: by 10.99.156.2 with SMTP id f2mr12960932pge.65.1491458838865; Wed, 05 Apr 2017 23:07:18 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id e5sm1223782pga.13.2017.04.05.23.07.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Apr 2017 23:07:18 -0700 (PDT) From: Amit Pundir To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org Subject: [PATCH for-3.18] Revert "ARM: 8457/1: psci-smp is built only for SMP" Date: Thu, 6 Apr 2017 11:37:14 +0530 Message-Id: <1491458834-28498-1-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This reverts commit dbcfee724255ae171af51aaa56d8c5b78342adc9. 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 --- arch/arm/include/asm/psci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index e3789fb..c25ef3e 100644 --- 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