This is a note to let you know that I've just added the patch titled
ARM: psci: fix header file
to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-psci-fix-header-file.patch
and it can be found in the queue-3.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From arnd@xxxxxxxx Thu Apr 27 11:58:20 2017
From: Arnd Bergmann <arnd@xxxxxxxx>
Date: Fri, 21 Apr 2017 15:59:17 +0200
Subject: ARM: psci: fix header file
To: stable@xxxxxxxxxxxxxxx
Cc: gregkh@xxxxxxxxxxxxxxxxxxx, Arnd Bergmann <arnd@xxxxxxxx>, Russell King <linux@xxxxxxxxxxxxxxxx>, linux-arm-kernel@xxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx
Message-ID: <20170421135923.2735181-1-arnd@xxxxxxxx>
From: Arnd Bergmann <arnd@xxxxxxxx>
Commit be95485a0b828 was incorrectly backported to 3.18 and
now causes a different build error when CONFIG_SMP is disabled:
arch/arm/kernel/psci.c:287:12: error: redefinition of 'psci_init'
This version is how it should be on 3.18, with the main psci
code built for both SMP and UP, but the psci_smp_available()
function only being available for SMP builds.
Fixes: dbcfee724255 ("ARM: 8457/1: psci-smp is built only for SMP")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm/include/asm/psci.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
index e3789fb02c9c..8ca5308a05d7 100644
--- a/arch/arm/include/asm/psci.h
+++ b/arch/arm/include/asm/psci.h
@@ -37,11 +37,15 @@ 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
static inline int psci_init(void) { return 0; }
+#endif
+
+#if defined(CONFIG_SMP) && defined(CONFIG_ARM_PSCI)
+bool psci_smp_available(void);
+#else
static inline bool psci_smp_available(void) { return false; }
#endif
--
2.9.0
Patches currently in stable-queue which might be from arnd@xxxxxxxx are
queue-3.18/acpi-power-avoid-maybe-uninitialized-warning.patch
queue-3.18/gadgetfs-fix-uninitialized-variable-in-error-handling.patch
queue-3.18/clk-at91-usb-fix-determine_rate-prototype-again.patch
queue-3.18/arm-psci-fix-header-file.patch
queue-3.18/dm-bufio-hide-bogus-warning.patch