5.4-stable patches

added patches:
	avoid-__memcat_p-link-failure.patch

diff --git a/queue-5.4/avoid-__memcat_p-link-failure.patch b/queue-5.4/avoid-__memcat_p-link-failure.patch
new file mode 100644 (file)
index 0000000..68644c3
--- /dev/null
+++ b/queue-5.4/avoid-__memcat_p-link-failure.patch
@@ -0,0 +1,51 @@
+From arnd@kernel.org  Tue May  4 16:15:19 2021
+From: Arnd Bergmann <arnd@kernel.org>
+Date: Tue,  4 May 2021 12:44:33 +0200
+Subject: avoid __memcat_p link failure
+To: stable@vger.kernel.org
+Cc: Arnd Bergmann <arnd@arndb.de>, kernel test robot <lkp@intel.com>, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com
+Message-ID: <20210504104441.1317138-1-arnd@kernel.org>
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+The kernel test robot reports a link error when the stm driver is a
+loadable module on any v5.4 kernel:
+
+> ERROR: "__memcat_p" [drivers/hwtracing/stm/stm_core.ko] undefined!
+
+This was fixed in mainline with commit 7273ad2b08f8 ("kbuild: link
+lib-y objects to vmlinux forcibly when CONFIG_MODULES=y"), which
+is fairly intrusive.
+
+Fix the v5.4 specific issue with a minimal subset of that patch,
+linking only the failing object into the kernel. Kernels before v4.20
+are not affected.
+
+Reported-by: kernel test robot <lkp@intel.com>
+Link: https://groups.google.com/g/clang-built-linux/c/H-PrABqYShg
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ lib/Makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -31,7 +31,7 @@ lib-y := ctype.o string.o vsprintf.o cmd
+        flex_proportions.o ratelimit.o show_mem.o \
+        is_single_threaded.o plist.o decompress.o kobject_uevent.o \
+        earlycpio.o seq_buf.o siphash.o dec_and_lock.o \
+-       nmi_backtrace.o nodemask.o win_minmax.o memcat_p.o
++       nmi_backtrace.o nodemask.o win_minmax.o
+ 
+ lib-$(CONFIG_PRINTK) += dump_stack.o
+ lib-$(CONFIG_MMU) += ioremap.o
+@@ -46,7 +46,7 @@ obj-y += bcd.o sort.o parser.o debug_loc
+        bsearch.o find_bit.o llist.o memweight.o kfifo.o \
+        percpu-refcount.o rhashtable.o \
+        once.o refcount.o usercopy.o errseq.o bucket_locks.o \
+-       generic-radix-tree.o
++       generic-radix-tree.o memcat_p.o
+ obj-$(CONFIG_STRING_SELFTEST) += test_string.o
+ obj-y += string_helpers.o
+ obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o

diff --git a/queue-5.4/series b/queue-5.4/series
index b5031dcc6d1b1e569ac4317ca74581d9fb913b79..8e08bfe82268c41778dcfe8c2760e17f5b41653c 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -6,3 +6,4 @@ igb-enable-rss-for-intel-i211-ethernet-controller.patch
 iwlwifi-fix-softirq-hardirq-disabling-in-iwl_pcie_enqueue_hcmd.patch
 bpf-fix-masking-negation-logic-upon-negative-dst-register.patch
 bpf-fix-leakage-of-uninitialized-bpf-stack-under-speculation.patch
+avoid-__memcat_p-link-failure.patch