From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 13 Sep 2018 07:38:34 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v4.4.156~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=485ce5f2972dedd40b849ae0f83af4f4cc709c32;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	arm64-cpu_errata-include-required-headers.patch
---

diff --git a/queue-4.14/arm64-cpu_errata-include-required-headers.patch b/queue-4.14/arm64-cpu_errata-include-required-headers.patch
new file mode 100644
index 00000000000..db793d89098
--- /dev/null
+++ b/queue-4.14/arm64-cpu_errata-include-required-headers.patch
@@ -0,0 +1,39 @@
+From 94a5d8790e79ab78f499d2d9f1ff2cab63849d9f Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Tue, 5 Jun 2018 13:50:07 +0200
+Subject: arm64: cpu_errata: include required headers
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit 94a5d8790e79ab78f499d2d9f1ff2cab63849d9f upstream.
+
+Without including psci.h and arm-smccc.h, we now get a build failure in
+some configurations:
+
+arch/arm64/kernel/cpu_errata.c: In function 'arm64_update_smccc_conduit':
+arch/arm64/kernel/cpu_errata.c:278:10: error: 'psci_ops' undeclared (first use in this function); did you mean 'sysfs_ops'?
+
+arch/arm64/kernel/cpu_errata.c: In function 'arm64_set_ssbd_mitigation':
+arch/arm64/kernel/cpu_errata.c:311:3: error: implicit declaration of function 'arm_smccc_1_1_hvc' [-Werror=implicit-function-declaration]
+   arm_smccc_1_1_hvc(ARM_SMCCC_ARCH_WORKAROUND_2, state, NULL);
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+Cc: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm64/kernel/cpu_errata.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/arm64/kernel/cpu_errata.c
++++ b/arch/arm64/kernel/cpu_errata.c
+@@ -16,6 +16,8 @@
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include <linux/arm-smccc.h>
++#include <linux/psci.h>
+ #include <linux/types.h>
+ #include <asm/cpu.h>
+ #include <asm/cputype.h>
diff --git a/queue-4.14/series b/queue-4.14/series
index bc49e4cb639..9da2fb4aab2 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -109,3 +109,4 @@ irda-only-insert-new-objects-into-the-global-database-via-setsockopt.patch
 revert-arm-imx_v6_v7_defconfig-select-ulpi-support.patch
 kvm-x86-set-highest-physical-address-bits-in-non-present-reserved-sptes.patch
 x86-kvm-avoid-unused-variable-warning.patch
+arm64-cpu_errata-include-required-headers.patch