4.4-stable patches

added patches:
	powerpc-uaccess-flush-fix-corenet64_smp_defconfig-build.patch

diff --git a/queue-4.4/powerpc-uaccess-flush-fix-corenet64_smp_defconfig-build.patch b/queue-4.4/powerpc-uaccess-flush-fix-corenet64_smp_defconfig-build.patch
new file mode 100644 (file)
index 0000000..a0bd40a
--- /dev/null
+++ b/queue-4.4/powerpc-uaccess-flush-fix-corenet64_smp_defconfig-build.patch
@@ -0,0 +1,53 @@
+From dja@axtens.net  Mon Nov 23 08:20:00 2020
+From: Daniel Axtens <dja@axtens.net>
+Date: Mon, 23 Nov 2020 13:58:22 +1100
+Subject: [PATCH v4.4] powerpc/uaccess-flush: fix corenet64_smp_defconfig build
+To: stable@vger.kernel.org
+Cc: dja@axtens.net
+Message-ID: <20201123025822.458568-1-dja@axtens.net>
+
+From: Daniel Axtens <dja@axtens.net>
+
+Gunter reports problems with the corenet64_smp_defconfig:
+
+In file included from arch/powerpc/kernel/ppc_ksyms.c:10:0:
+arch/powerpc/include/asm/book3s/64/kup-radix.h:11:29: error: redefinition of ‘allow_user_access’
+ static __always_inline void allow_user_access(void __user *to, const void __user *from,
+                            ^~~~~~~~~~~~~~~~~
+In file included from arch/powerpc/include/asm/uaccess.h:12:0,
+                from arch/powerpc/kernel/ppc_ksyms.c:8:
+arch/powerpc/include/asm/kup.h:12:20: note: previous definition of ‘allow_user_access’ was here
+ static inline void allow_user_access(void __user *to, const void __user *from,
+                   ^~~~~~~~~~~~~~~~~
+
+This is because ppc_ksyms.c imports asm/book3s/64/kup-radix.h guarded by
+CONFIG_PPC64, rather than CONFIG_PPC_BOOK3S_64 which it should do.
+
+Fix 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/kernel/ppc_ksyms.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/powerpc/kernel/ppc_ksyms.c
++++ b/arch/powerpc/kernel/ppc_ksyms.c
+@@ -6,7 +6,7 @@
+ #include <asm/cacheflush.h>
+ #include <asm/epapr_hcalls.h>
+ #include <asm/uaccess.h>
+-#ifdef CONFIG_PPC64
++#ifdef CONFIG_PPC_BOOK3S_64
+ #include <asm/book3s/64/kup-radix.h>
+ #endif
+ 
+@@ -50,6 +50,6 @@ EXPORT_SYMBOL(current_stack_pointer);
+ 
+ EXPORT_SYMBOL(__arch_clear_user);
+ 
+-#ifdef CONFIG_PPC64
++#ifdef CONFIG_PPC_BOOK3S_64
+ EXPORT_SYMBOL(do_uaccess_flush);
+ #endif

diff --git a/queue-4.4/series b/queue-4.4/series
index b342b5061308e629c648b1cb48c36f1adb533ed6..2777f9cec63bcef35512f1f05b2c961a8a883ded 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -23,3 +23,4 @@ can-m_can-m_can_handle_state_change-fix-state-change.patch
 mips-alchemy-fix-memleak-in-alchemy_clk_setup_cpu.patch
 regulator-ti-abb-fix-array-out-of-bound-read-access-.patch
 libfs-fix-error-cast-of-negative-value-in-simple_att.patch
+powerpc-uaccess-flush-fix-corenet64_smp_defconfig-build.patch