From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 25 Oct 2021 19:00:37 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v4.4.290~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56ef373beffd1c14236cf53f99ccde592bf1c13d;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	arm-9122-1-select-have_futex_cmpxchg.patch
---

diff --git a/queue-5.4/arm-9122-1-select-have_futex_cmpxchg.patch b/queue-5.4/arm-9122-1-select-have_futex_cmpxchg.patch
new file mode 100644
index 00000000000..82d482f60f9
--- /dev/null
+++ b/queue-5.4/arm-9122-1-select-have_futex_cmpxchg.patch
@@ -0,0 +1,51 @@
+From 9d417cbe36eee7afdd85c2e871685f8dab7c2dba Mon Sep 17 00:00:00 2001
+From: Nick Desaulniers <ndesaulniers@google.com>
+Date: Wed, 8 Sep 2021 19:25:59 +0100
+Subject: ARM: 9122/1: select HAVE_FUTEX_CMPXCHG
+
+From: Nick Desaulniers <ndesaulniers@google.com>
+
+commit 9d417cbe36eee7afdd85c2e871685f8dab7c2dba upstream.
+
+tglx notes:
+  This function [futex_detect_cmpxchg] is only needed when an
+  architecture has to runtime discover whether the CPU supports it or
+  not.  ARM has unconditional support for this, so the obvious thing to
+  do is the below.
+
+Fixes linkage failure from Clang randconfigs:
+kernel/futex.o:(.text.fixup+0x5c): relocation truncated to fit: R_ARM_JUMP24 against `.init.text'
+and boot failures for CONFIG_THUMB2_KERNEL.
+
+Link: https://github.com/ClangBuiltLinux/linux/issues/325
+
+Comments from Nick Desaulniers:
+
+ See-also: 03b8c7b623c8 ("futex: Allow architectures to skip
+ futex_atomic_cmpxchg_inatomic() test")
+
+Reported-by: Arnd Bergmann <arnd@arndb.de>
+Reported-by: Nathan Chancellor <nathan@kernel.org>
+Suggested-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
+Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
+Tested-by: Nathan Chancellor <nathan@kernel.org>
+Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
+Cc: stable@vger.kernel.org # v3.14+
+Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -85,6 +85,7 @@ config ARM
+ 	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
+ 	select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG
+ 	select HAVE_FUNCTION_TRACER if !XIP_KERNEL && (CC_IS_GCC || CLANG_VERSION >= 100000)
++	select HAVE_FUTEX_CMPXCHG if FUTEX
+ 	select HAVE_GCC_PLUGINS
+ 	select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)
+ 	select HAVE_IDE if PCI || ISA || PCMCIA
diff --git a/queue-5.4/series b/queue-5.4/series
index 38f41e38d99..bba025b44f4 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -54,3 +54,4 @@ scsi-core-fix-shost-cmd_per_lun-calculation-in-scsi_add_host_with_dma.patch
 usbnet-sanity-check-for-maxpacket.patch
 net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch
 tracing-have-all-levels-of-checks-prevent-recursion.patch
+arm-9122-1-select-have_futex_cmpxchg.patch