From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 28 Apr 2020 10:44:34 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v4.19.119~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abe250feb0e55f165b13b08b5c43786425042971;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	compat-arm64-always-include-asm-generic-compat.h.patch
---

diff --git a/queue-5.4/compat-arm64-always-include-asm-generic-compat.h.patch b/queue-5.4/compat-arm64-always-include-asm-generic-compat.h.patch
new file mode 100644
index 00000000000..26e6c6eeae7
--- /dev/null
+++ b/queue-5.4/compat-arm64-always-include-asm-generic-compat.h.patch
@@ -0,0 +1,46 @@
+From 556d687a4ccd54ab50a721ddde42c820545effd9 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Mon, 9 Dec 2019 16:16:20 +0100
+Subject: compat: ARM64: always include asm-generic/compat.h
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit 556d687a4ccd54ab50a721ddde42c820545effd9 upstream.
+
+In order to use compat_* type defininitions in device drivers
+outside of CONFIG_COMPAT, move the inclusion of asm-generic/compat.h
+ahead of the #ifdef.
+
+All other architectures already do this.
+
+Acked-by: Will Deacon <will@kernel.org>
+Reviewed-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Cc: Naresh Kamboju <naresh.kamboju@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm64/include/asm/compat.h |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/arch/arm64/include/asm/compat.h
++++ b/arch/arm64/include/asm/compat.h
+@@ -4,6 +4,9 @@
+  */
+ #ifndef __ASM_COMPAT_H
+ #define __ASM_COMPAT_H
++
++#include <asm-generic/compat.h>
++
+ #ifdef CONFIG_COMPAT
+ 
+ /*
+@@ -13,8 +16,6 @@
+ #include <linux/sched.h>
+ #include <linux/sched/task_stack.h>
+ 
+-#include <asm-generic/compat.h>
+-
+ #define COMPAT_USER_HZ		100
+ #ifdef __AARCH64EB__
+ #define COMPAT_UTS_MACHINE	"armv8b\0\0"
diff --git a/queue-5.4/series b/queue-5.4/series
index b0d41d0fdda..165014263c0 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -164,3 +164,4 @@ revert-serial-uartps-move-port-id-to-device-data-structure.patch
 revert-serial-uartps-register-own-uart-console-and-driver-structures.patch
 powerpc-kuap-ppc_kuap_debug-should-depend-on-ppc_kuap.patch
 powerpc-mm-fix-config_ppc_kuap_debug-on-ppc32.patch
+compat-arm64-always-include-asm-generic-compat.h.patch