From 8e22e46e02b17ecfecf8182896d0e413fbc0f339 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Fri, 30 Jul 2021 18:34:59 -0400 Subject: [PATCH] Fixes for 4.14 Signed-off-by: Sasha Levin --- queue-4.14/series | 1 + ...sm-proto.h-can-be-included-stand-alo.patch | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 queue-4.14/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch diff --git a/queue-4.14/series b/queue-4.14/series index 78cb0e8cad8..0293a9b7205 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -13,3 +13,4 @@ hfs-add-lock-nesting-notation-to-hfs_find_init.patch arm-dts-versatile-fix-up-interrupt-controller-node-n.patch 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.14/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch b/queue-4.14/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch new file mode 100644 index 00000000000..a16029ee4c0 --- /dev/null +++ b/queue-4.14/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch @@ -0,0 +1,53 @@ +From 95e394f42c941903792e94d507665a16cc1fea76 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +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 + +[ 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 +Signed-off-by: Borislav Petkov +Link: https://lkml.kernel.org/r/b76b4be3-cf66-f6b2-9a6c-3e7ef54f9845@web.de +Signed-off-by: Sasha Levin +--- + 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 + ++struct task_struct; ++ + /* misc architecture specific prototypes */ + + void syscall_init(void); +-- +2.30.2 + -- 2.47.3