From: Greg Kroah-Hartman Date: Mon, 6 Sep 2021 06:57:55 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.10.63~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28821a0d24cd2ba37d3a1ffede24155fc735a589;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: arm-8918-2-only-build-return_address-if-needed.patch xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch --- diff --git a/queue-4.14/arm-8918-2-only-build-return_address-if-needed.patch b/queue-4.14/arm-8918-2-only-build-return_address-if-needed.patch new file mode 100644 index 00000000000..5a3ad7d88dc --- /dev/null +++ b/queue-4.14/arm-8918-2-only-build-return_address-if-needed.patch @@ -0,0 +1,65 @@ +From fb033c95c94ca1ee3d16e04ebdb85d65fb55fff8 Mon Sep 17 00:00:00 2001 +From: Ben Dooks +Date: Mon, 4 Nov 2019 18:15:15 +0100 +Subject: ARM: 8918/2: only build return_address() if needed + +From: Ben Dooks + +commit fb033c95c94ca1ee3d16e04ebdb85d65fb55fff8 upstream. + +The system currently warns if the config conditions for +building return_address in arch/arm/kernel/return_address.c +are not met, leaving just an EXPORT_SYMBOL_GPL(return_address) +of a function defined to be 'static linline'. +This is a result of aeea3592a13b ("ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h"). + +Since we're not going to build anything other than an exported +symbol for something that is already being defined to be an +inline-able return of NULL, just avoid building the code to +remove the following warning: + +Fixes: aeea3592a13b ("ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h") +Signed-off-by: Ben Dooks +Signed-off-by: Russell King +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/kernel/Makefile | 6 +++++- + arch/arm/kernel/return_address.c | 4 ---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +--- a/arch/arm/kernel/Makefile ++++ b/arch/arm/kernel/Makefile +@@ -17,10 +17,14 @@ CFLAGS_REMOVE_return_address.o = -pg + # Object file lists. + + obj-y := elf.o entry-common.o irq.o opcodes.o \ +- process.o ptrace.o reboot.o return_address.o \ ++ process.o ptrace.o reboot.o \ + setup.o signal.o sigreturn_codes.o \ + stacktrace.o sys_arm.o time.o traps.o + ++ifneq ($(CONFIG_ARM_UNWIND),y) ++obj-$(CONFIG_FRAME_POINTER) += return_address.o ++endif ++ + obj-$(CONFIG_ATAGS) += atags_parse.o + obj-$(CONFIG_ATAGS_PROC) += atags_proc.o + obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += atags_compat.o +--- a/arch/arm/kernel/return_address.c ++++ b/arch/arm/kernel/return_address.c +@@ -10,8 +10,6 @@ + */ + #include + #include +- +-#if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) + #include + + #include +@@ -56,6 +54,4 @@ void *return_address(unsigned int level) + return NULL; + } + +-#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */ +- + EXPORT_SYMBOL_GPL(return_address); diff --git a/queue-4.14/series b/queue-4.14/series index 54c54c1d496..7ed35100365 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1,7 +1,9 @@ ext4-fix-race-writing-to-an-inline_data-file-while-its-xattrs-are-changing.patch +xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch qed-fix-the-vf-msix-vectors-flow.patch net-macb-add-a-null-check-on-desc_ptp.patch qede-fix-memset-corruption.patch perf-x86-intel-pt-fix-mask-of-num_address_ranges.patch perf-x86-amd-ibs-work-around-erratum-1197.patch cryptoloop-add-a-deprecation-warning.patch +arm-8918-2-only-build-return_address-if-needed.patch diff --git a/queue-4.14/xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch b/queue-4.14/xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch new file mode 100644 index 00000000000..e31dabd1122 --- /dev/null +++ b/queue-4.14/xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch @@ -0,0 +1,40 @@ +From ed5aacc81cd41efc4d561e14af408d1003f7b855 Mon Sep 17 00:00:00 2001 +From: Randy Dunlap +Date: Wed, 26 May 2021 00:03:37 -0700 +Subject: xtensa: fix kconfig unmet dependency warning for HAVE_FUTEX_CMPXCHG + +From: Randy Dunlap + +commit ed5aacc81cd41efc4d561e14af408d1003f7b855 upstream. + +XTENSA should only select HAVE_FUTEX_CMPXCHG when FUTEX is +set/enabled. This prevents a kconfig warning. + +WARNING: unmet direct dependencies detected for HAVE_FUTEX_CMPXCHG + Depends on [n]: FUTEX [=n] + Selected by [y]: + - XTENSA [=y] && !MMU [=n] + +Fixes: d951ba21b959 ("xtensa: nommu: select HAVE_FUTEX_CMPXCHG") +Signed-off-by: Randy Dunlap +Cc: Max Filippov +Cc: Chris Zankel +Cc: linux-xtensa@linux-xtensa.org +Message-Id: <20210526070337.28130-1-rdunlap@infradead.org> +Signed-off-by: Max Filippov +Signed-off-by: Greg Kroah-Hartman +--- + arch/xtensa/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/xtensa/Kconfig ++++ b/arch/xtensa/Kconfig +@@ -20,7 +20,7 @@ config XTENSA + select HAVE_DMA_CONTIGUOUS + select HAVE_EXIT_THREAD + select HAVE_FUNCTION_TRACER +- select HAVE_FUTEX_CMPXCHG if !MMU ++ select HAVE_FUTEX_CMPXCHG if !MMU && FUTEX + select HAVE_HW_BREAKPOINT if PERF_EVENTS + select HAVE_IRQ_TIME_ACCOUNTING + select HAVE_MEMBLOCK