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

Fixes for 4.19

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

diff --git a/queue-4.19/series b/queue-4.19/series
index 6884e53e3ef..fa5f9675e10 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -1,2 +1,3 @@
 virtio_net-do-not-pull-payload-in-skb-head.patch
 gro-ensure-frag0-meets-ip-header-alignment.patch
+x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
diff --git a/queue-4.19/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch b/queue-4.19/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
new file mode 100644
index 00000000000..1463716989d
--- /dev/null
+++ b/queue-4.19/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
@@ -0,0 +1,53 @@
+From c63c2a0a183a4fa2c486888744d94f6672ff163d 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 6e81788a30c1..0eaca7a130c9 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
+