From: Greg Kroah-Hartman Date: Mon, 6 Sep 2021 06:58:59 +0000 (+0200) Subject: 5.14-stable patches X-Git-Tag: v5.10.63~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5661265c802547d3b6aa9cccd8c14dac1e12461c;p=thirdparty%2Fkernel%2Fstable-queue.git 5.14-stable patches added patches: xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch --- diff --git a/queue-5.14/series b/queue-5.14/series index 23e63a16edc..a874fc92710 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -1,2 +1,3 @@ ext4-fix-race-writing-to-an-inline_data-file-while-its-xattrs-are-changing.patch ext4-fix-e2fsprogs-checksum-failure-for-mounted-filesystem.patch +xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch diff --git a/queue-5.14/xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch b/queue-5.14/xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch new file mode 100644 index 00000000000..3fa63259d18 --- /dev/null +++ b/queue-5.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 +@@ -30,7 +30,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_PCI