From: Sasha Levin <sashal@kernel.org>
Date: Fri, 30 Jul 2021 22:34:59 +0000 (-0400)
Subject: Fixes for 4.9
X-Git-Tag: v5.13.7~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20e6f01af85dd48805b5b4bdd725a3ba27544cb4;p=thirdparty%2Fkernel%2Fstable-queue.git

Fixes for 4.9

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.9/series b/queue-4.9/series
index 5ed5118c188..6006b944f4b 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -12,3 +12,4 @@ hfs-add-lock-nesting-notation-to-hfs_find_init.patch
 arm-dts-versatile-fix-up-interrupt-controller-node-n.patch
 lib-string.c-add-multibyte-memset-functions.patch
 arm-ensure-the-signal-page-contains-defined-contents.patch
+x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
diff --git a/queue-4.9/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch b/queue-4.9/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
new file mode 100644
index 00000000000..91b566fffa2
--- /dev/null
+++ b/queue-4.9/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
@@ -0,0 +1,53 @@
+From c784d07268df9cd8c70f23d66e795f6b12c928fe Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sun, 11 Apr 2021 10:12:16 +0200
+Subject: x86/asm: Ensure asm/proto.h can be included stand-alone
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Jan Kiszka <jan.kiszka@siemens.com>
+
+[ Upstream commit f7b21a0e41171d22296b897dac6e4c41d2a3643c ]
+
+Fix:
+
+  ../arch/x86/include/asm/proto.h:14:30: warning: ‘struct task_struct’ declared \
+    inside parameter list will not be visible outside of this definition or declaration
+  long do_arch_prctl_64(struct task_struct *task, int option, unsigned long arg2);
+                               ^~~~~~~~~~~
+
+  .../arch/x86/include/asm/proto.h:40:34: warning: ‘struct task_struct’ declared \
+    inside parameter list will not be visible outside of this definition or declaration
+   long do_arch_prctl_common(struct task_struct *task, int option,
+                                    ^~~~~~~~~~~
+
+if linux/sched.h hasn't be included previously. This fixes a build error
+when this header is used outside of the kernel tree.
+
+ [ bp: Massage commit message. ]
+
+Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Link: https://lkml.kernel.org/r/b76b4be3-cf66-f6b2-9a6c-3e7ef54f9845@web.de
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/x86/include/asm/proto.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h
+index 9b9b30b19441..36a7a3f11839 100644
+--- a/arch/x86/include/asm/proto.h
++++ b/arch/x86/include/asm/proto.h
+@@ -3,6 +3,8 @@
+ 
+ #include <asm/ldt.h>
+ 
++struct task_struct;
++
+ /* misc architecture specific prototypes */
+ 
+ void syscall_init(void);
+-- 
+2.30.2
+