4.14-stable patches

added patches:
	powerpc-uaccess-flush-fix-missing-includes-in-kup-radix.h.patch

diff --git a/queue-4.14/powerpc-uaccess-flush-fix-missing-includes-in-kup-radix.h.patch b/queue-4.14/powerpc-uaccess-flush-fix-missing-includes-in-kup-radix.h.patch
new file mode 100644 (file)
index 0000000..14da1b1
--- /dev/null
+++ b/queue-4.14/powerpc-uaccess-flush-fix-missing-includes-in-kup-radix.h.patch
@@ -0,0 +1,51 @@
+From dja@axtens.net  Mon Nov 23 08:19:02 2020
+From: Daniel Axtens <dja@axtens.net>
+Date: Mon, 23 Nov 2020 15:45:07 +1100
+Subject: powerpc/uaccess-flush: fix missing includes in kup-radix.h
+To: stable@vger.kernel.org
+Cc: dja@axtens.net, linux@roeck-us.net
+Message-ID: <20201123044507.464364-1-dja@axtens.net>
+
+From: Daniel Axtens <dja@axtens.net>
+
+Guenter reports a build failure on cell_defconfig and maple_defconfg:
+
+In file included from arch/powerpc/include/asm/kup.h:10:0,
+                from arch/powerpc/include/asm/uaccess.h:12,
+                from arch/powerpc/lib/checksum_wrappers.c:24:
+arch/powerpc/include/asm/book3s/64/kup-radix.h:5:1: error: data definition has no type or storage class [-Werror]
+ DECLARE_STATIC_KEY_FALSE(uaccess_flush_key);
+ ^~~~~~~~~~~~~~~~~~~~~~~~
+arch/powerpc/include/asm/book3s/64/kup-radix.h:5:1: error: type defaults to ‘int’ in declaration of ‘DECLARE_STATIC_KEY_FALSE’ [-Werror=implicit-int]
+arch/powerpc/include/asm/book3s/64/kup-radix.h:5:1: error: parameter names (without types) in function declaration [-Werror]
+arch/powerpc/include/asm/book3s/64/kup-radix.h: In function ‘prevent_user_access’:
+arch/powerpc/include/asm/book3s/64/kup-radix.h:18:6: error: implicit declaration of function ‘static_branch_unlikely’ [-Werror=implicit-function-declaration]
+  if (static_branch_unlikely(&uaccess_flush_key))
+      ^~~~~~~~~~~~~~~~~~~~~~
+arch/powerpc/include/asm/book3s/64/kup-radix.h:18:30: error: ‘uaccess_flush_key’ undeclared (first use in this function); did you mean
+‘do_uaccess_flush’?
+  if (static_branch_unlikely(&uaccess_flush_key))
+                             ^~~~~~~~~~~~~~~~~
+                             do_uaccess_flush
+arch/powerpc/include/asm/book3s/64/kup-radix.h:18:30: note: each undeclared identifier is reported only once for each function it appears in
+cc1: all warnings being treated as errors
+
+This is because I failed to include linux/jump_label.h in kup-radix.h. Include it.
+
+Reported-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Daniel Axtens <dja@axtens.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/powerpc/include/asm/book3s/64/kup-radix.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/powerpc/include/asm/book3s/64/kup-radix.h
++++ b/arch/powerpc/include/asm/book3s/64/kup-radix.h
+@@ -1,6 +1,7 @@
+ /* SPDX-License-Identifier: GPL-2.0 */
+ #ifndef _ASM_POWERPC_BOOK3S_64_KUP_RADIX_H
+ #define _ASM_POWERPC_BOOK3S_64_KUP_RADIX_H
++#include <linux/jump_label.h>
+ 
+ DECLARE_STATIC_KEY_FALSE(uaccess_flush_key);
+ 

diff --git a/queue-4.14/series b/queue-4.14/series
index dd6a3d7a338246b6e4806e7459a219c6e0164756..c5a3aaf4dd8b5ccbd44031b0f437e360232f8b91 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -38,3 +38,4 @@ mips-alchemy-fix-memleak-in-alchemy_clk_setup_cpu.patch
 regulator-ti-abb-fix-array-out-of-bound-read-access-.patch
 xfs-revert-xfs-fix-rmap-key-and-record-comparison-fu.patch
 libfs-fix-error-cast-of-negative-value-in-simple_att.patch
+powerpc-uaccess-flush-fix-missing-includes-in-kup-radix.h.patch