UPSTREAM: ARM: 8457/1: psci-smp is built only for SMP
authorArnd Bergmann <arnd@arndb.de>
Thu, 19 Nov 2015 14:03:57 +0000 (15:03 +0100)
committerOlof Johansson <olofj@google.com>
Thu, 3 Mar 2016 22:05:44 +0000 (22:05 +0000)
commit6b7afd3c5e1af8db9e933bf9a7438e3d3a5035f5
tree5f6a67e57b9feadd6b6524741d459f3c9c08bbab
parent57b21d0a63f9968a147188410c0cfc266e4be934
UPSTREAM: 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>
(cherry picked from commit be95485a0b8288a93402705730d3ea32f9f812b9)
Signed-off-by: Olof Johansson <olofj@google.com>
arch/arm/include/asm/psci.h