From 03d0d4b0ce848b43500b12f69f7bb2840b34817f Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 21 Apr 2020 21:34:28 +0200
Subject: [PATCH] 4.9-stable patches

added patches:
	arm64-cpu_errata-include-required-headers.patch
---
 ...-cpu_errata-include-required-headers.patch | 39 +++++++++++++++++++
 queue-4.9/series                              |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 queue-4.9/arm64-cpu_errata-include-required-headers.patch

diff --git a/queue-4.9/arm64-cpu_errata-include-required-headers.patch b/queue-4.9/arm64-cpu_errata-include-required-headers.patch
new file mode 100644
index 00000000000..4a7f7dbf7f6
--- /dev/null
+++ b/queue-4.9/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>
+Signed-off-by: Nathan Chancellor <natechancellor@gmail.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/cachetype.h>
+ #include <asm/cpu.h>
diff --git a/queue-4.9/series b/queue-4.9/series
index 01ac0272113..aeb268524bd 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -98,3 +98,4 @@ rtc-pm8xxx-fix-issue-in-rtc-write-path.patch
 wil6210-fix-length-check-in-__wmi_send.patch
 soc-qcom-smem-use-le32_to_cpu-for-comparison.patch
 of-fix-missing-kobject-init-for-sysfs-of_dynamic-config.patch
+arm64-cpu_errata-include-required-headers.patch
-- 
2.47.3