From 50682a8e70962ea2ce21122cab08735d95b27131 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Nov 2020 08:22:23 +0100 Subject: [PATCH] 4.4-stable patches added patches: powerpc-uaccess-flush-fix-corenet64_smp_defconfig-build.patch --- ...sh-fix-corenet64_smp_defconfig-build.patch | 53 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 54 insertions(+) create mode 100644 queue-4.4/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 index 00000000000..a0bd40a6d73 --- /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 +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 + +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 +Signed-off-by: Daniel Axtens +Signed-off-by: Greg Kroah-Hartman +--- + 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 + #include + #include +-#ifdef CONFIG_PPC64 ++#ifdef CONFIG_PPC_BOOK3S_64 + #include + #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 b342b506130..2777f9cec63 100644 --- 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 -- 2.47.3