Browse Source

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>
Arnd Bergmann 9 years ago
parent
commit
be95485a0b
1 changed files with 1 additions and 1 deletions
  1. 1 1
      arch/arm/include/asm/psci.h

+ 1 - 1
arch/arm/include/asm/psci.h

@@ -16,7 +16,7 @@
 
 
 extern struct smp_operations psci_smp_ops;
 extern struct smp_operations psci_smp_ops;
 
 
-#ifdef CONFIG_ARM_PSCI
+#if defined(CONFIG_SMP) && defined(CONFIG_ARM_PSCI)
 bool psci_smp_available(void);
 bool psci_smp_available(void);
 #else
 #else
 static inline bool psci_smp_available(void) { return false; }
 static inline bool psci_smp_available(void) { return false; }