From patchwork Fri Feb 19 02:15:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shi X-Patchwork-Id: 62260 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp911491lbl; Thu, 18 Feb 2016 18:15:28 -0800 (PST) X-Received: by 10.67.6.226 with SMTP id cx2mr14690745pad.93.1455848128794; Thu, 18 Feb 2016 18:15:28 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v68si13096350pfi.16.2016.02.18.18.15.28; Thu, 18 Feb 2016 18:15:28 -0800 (PST) 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; 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; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1948185AbcBSCP1 (ORCPT + 3 others); Thu, 18 Feb 2016 21:15:27 -0500 Received: from mail-pf0-f171.google.com ([209.85.192.171]:34530 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1948184AbcBSCP0 (ORCPT ); Thu, 18 Feb 2016 21:15:26 -0500 Received: by mail-pf0-f171.google.com with SMTP id x65so42118159pfb.1 for ; Thu, 18 Feb 2016 18:15:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=to:subject:cc:from:message-id:date:user-agent:mime-version :content-type:content-transfer-encoding; bh=6VR4uCyW6aLpOI9qgZOfq6VW9+MyQrBMGzJjtWamny0=; b=P+Nn/s5ytRKI2uPKhairyId8TTaKVQGdumPGH6lROCajcYMYSI3ypg7x0TONJoEn/9 oiUyEmNjLpdkzS50XyK3mPVI2OVwkfsm6xCjr4Hpk4Xub1ThJoW+3qmWbOc5mTsVOBFu UvcKc9hQze1y/gKTWICdVXMc+VwKr0dBJXLos= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:subject:cc:from:message-id:date:user-agent :mime-version:content-type:content-transfer-encoding; bh=6VR4uCyW6aLpOI9qgZOfq6VW9+MyQrBMGzJjtWamny0=; b=ahaMr2YfUTDLf1HrjJ26goc4dj9r/786TD5Pm05Rw1wf5nos+IMMjEahVJLh2mqbCI 6o390fmZZMA9Dys7mEh6iknankbmcxTLEJbM4iS4Orks3c+DaMy0oeVtylLrK/2Ad534 KVY0rb1MjFugapGBV42hsiSJJd137xIs2OqTXMKQyS+WwR9g5N3A3FqhoDVYx1Knpyoe GwhzU+nomzj8cIE7lWqiFVikWkR299leSbeJz56wcxHh7k+A3J4aa13yFlRtnUn4EV8R M4s0arFsNnzsiEqdKzqb3DI6KJKY1BzRGg5rY/cVbe9vswDqY9pjZsagwiin86dFz5HG qs/g== X-Gm-Message-State: AG10YOSuDfF0Ka75kufEQYkro+CMFp05sQIpLF76didEom5aYAtjJFtZjsnfbw6NT7oRGo2n X-Received: by 10.98.9.27 with SMTP id e27mr14826890pfd.59.1455848126287; Thu, 18 Feb 2016 18:15:26 -0800 (PST) Received: from [192.168.20.2] ([162.243.130.63]) by smtp.googlemail.com with ESMTPSA id h65sm13280413pfh.43.2016.02.18.18.15.23 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Feb 2016 18:15:25 -0800 (PST) To: "gregkh@linuxfoundation.org" , Arnd Bergmann Subject: patch to fix psci_smp_avaliable build error Cc: Mark Brown , stable@vger.kernel.org From: Alex Shi Message-ID: <56C67AB8.8020605@linaro.org> Date: Fri, 19 Feb 2016 10:15:20 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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; }