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 23e63a16edc80f2ccca2c36006b8e5f4b2c6d1b5..a874fc9271042fce446f5798af408508a3109778 100644 (file)
--- 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 (file)
index 0000000..3fa6325
--- /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 <rdunlap@infradead.org>
+Date: Wed, 26 May 2021 00:03:37 -0700
+Subject: xtensa: fix kconfig unmet dependency warning for HAVE_FUTEX_CMPXCHG
+
+From: Randy Dunlap <rdunlap@infradead.org>
+
+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 <rdunlap@infradead.org>
+Cc: Max Filippov <jcmvbkbc@gmail.com>
+Cc: Chris Zankel <chris@zankel.net>
+Cc: linux-xtensa@linux-xtensa.org
+Message-Id: <20210526070337.28130-1-rdunlap@infradead.org>
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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