From: Alex Shi <alex.shi@linaro.org>
To: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
Arnd Bergmann <arnd@arndb.de>
Cc: Mark Brown <broonie@linaro.org>, stable@vger.kernel.org
Subject: patch to fix psci_smp_avaliable build error
Date: Fri, 19 Feb 2016 10:15:20 +0800 [thread overview]
Message-ID: <56C67AB8.8020605@linaro.org> (raw)
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 <arnd@arndb.de>
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 <arnd@arndb.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
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; }
next reply other threads:[~2016-02-19 2:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-19 2:15 Alex Shi [this message]
2016-02-24 14:36 ` patch to fix psci_smp_avaliable build error Alex Shi
2016-02-24 17:07 ` gregkh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56C67AB8.8020605@linaro.org \
--to=alex.shi@linaro.org \
--cc=arnd@arndb.de \
--cc=broonie@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).