Fixes for 5.10

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

diff --git a/queue-5.10/series b/queue-5.10/series
index 8cf6370585c6b989a14c7feb1bdda454aebbf82e..9ddd0997d37c552b6e491476aff27195f27ddc6b 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -1 +1,2 @@
 io_uring-fix-null-ptr-deref-in-io_sq_offload_start.patch
+x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch

diff --git a/queue-5.10/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch b/queue-5.10/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
new file mode 100644 (file)
index 0000000..08f684b
--- /dev/null
+++ b/queue-5.10/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
@@ -0,0 +1,53 @@
+From 331999f617daeae9d6693a6cb0477dbfee17dd3e 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 b6a9d51d1d79..8c5d1910a848 100644
+--- a/arch/x86/include/asm/proto.h
++++ b/arch/x86/include/asm/proto.h
+@@ -4,6 +4,8 @@
+ 
+ #include <asm/ldt.h>
+ 
++struct task_struct;
++
+ /* misc architecture specific prototypes */
+ 
+ void syscall_init(void);
+-- 
+2.30.2
+