From: Greg Kroah-Hartman Date: Mon, 6 Sep 2021 06:46:12 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v5.10.63~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=269db2bfb62f6c93ba503218f6c52fa4163e27af;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: arc-fix-allnoconfig-build-warning.patch xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch --- diff --git a/queue-4.4/arc-fix-allnoconfig-build-warning.patch b/queue-4.4/arc-fix-allnoconfig-build-warning.patch new file mode 100644 index 00000000000..fd398b8c663 --- /dev/null +++ b/queue-4.4/arc-fix-allnoconfig-build-warning.patch @@ -0,0 +1,27 @@ +From 5464d03d92601ac2977ef605b0cbb33276567daf Mon Sep 17 00:00:00 2001 +From: Vineet Gupta +Date: Fri, 29 Sep 2017 14:46:50 -0700 +Subject: ARC: fix allnoconfig build warning + +From: Vineet Gupta + +commit 5464d03d92601ac2977ef605b0cbb33276567daf upstream. + +Reported-by: Dmitrii Kolesnichenko +Signed-off-by: Vineet Gupta +Signed-off-by: Greg Kroah-Hartman +--- + arch/arc/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arc/Kconfig ++++ b/arch/arc/Kconfig +@@ -23,7 +23,7 @@ config ARC + select GENERIC_SMP_IDLE_THREAD + select HAVE_ARCH_KGDB + select HAVE_ARCH_TRACEHOOK +- select HAVE_FUTEX_CMPXCHG ++ select HAVE_FUTEX_CMPXCHG if FUTEX + select HAVE_IOREMAP_PROT + select HAVE_KPROBES + select HAVE_KRETPROBES diff --git a/queue-4.4/series b/queue-4.4/series index feba81939fa..bce55b09d30 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -1,3 +1,5 @@ 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 +arc-fix-allnoconfig-build-warning.patch qede-fix-memset-corruption.patch cryptoloop-add-a-deprecation-warning.patch diff --git a/queue-4.4/xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch b/queue-4.4/xtensa-fix-kconfig-unmet-dependency-warning-for-have_futex_cmpxchg.patch new file mode 100644 index 00000000000..d30ef7cc86e --- /dev/null +++ b/queue-4.4/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 +@@ -17,7 +17,7 @@ config XTENSA + select HAVE_DMA_API_DEBUG + select HAVE_DMA_ATTRS + select HAVE_FUNCTION_TRACER +- select HAVE_FUTEX_CMPXCHG if !MMU ++ select HAVE_FUTEX_CMPXCHG if !MMU && FUTEX + select HAVE_IRQ_TIME_ACCOUNTING + select HAVE_OPROFILE + select HAVE_PERF_EVENTS