From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 15 Mar 2023 09:00:14 +0000 (+0100)
Subject: 6.1-stable patches
X-Git-Tag: v4.14.310~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d815ad1c827e727517f332874f91eeb830115217;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	uml-define-runtime_discard_exit.patch
---

diff --git a/queue-6.1/series b/queue-6.1/series
index c86e735a4e1..83cdaf96694 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -140,3 +140,4 @@ drm-amd-display-allow-subvp-on-vactive-pipes-that-are-2560x1440-60.patch
 drm-amd-display-adjust-mall-size-available-for-dcn32-and-dcn321.patch
 filelocks-use-mount-idmapping-for-setlease-permission-check.patch
 revert-bpf-test_run-fix-xdp_frame-misplacement-for-live_frames.patch
+uml-define-runtime_discard_exit.patch
diff --git a/queue-6.1/uml-define-runtime_discard_exit.patch b/queue-6.1/uml-define-runtime_discard_exit.patch
new file mode 100644
index 00000000000..7ca1463d308
--- /dev/null
+++ b/queue-6.1/uml-define-runtime_discard_exit.patch
@@ -0,0 +1,40 @@
+From b99ddbe8336ee680257c8ab479f75051eaa49dcf Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <masahiroy@kernel.org>
+Date: Wed, 8 Feb 2023 01:41:56 +0900
+Subject: UML: define RUNTIME_DISCARD_EXIT
+
+From: Masahiro Yamada <masahiroy@kernel.org>
+
+commit b99ddbe8336ee680257c8ab479f75051eaa49dcf upstream.
+
+With CONFIG_VIRTIO_UML=y, GNU ld < 2.36 fails to link UML vmlinux
+(w/wo CONFIG_LD_SCRIPT_STATIC).
+
+  `.exit.text' referenced in section `.uml.exitcall.exit' of arch/um/drivers/virtio_uml.o: defined in discarded section `.exit.text' of arch/um/drivers/virtio_uml.o
+  collect2: error: ld returned 1 exit status
+
+This fix is similar to the following commits:
+
+- 4b9880dbf3bd ("powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT")
+- a494398bde27 ("s390: define RUNTIME_DISCARD_EXIT to fix link error
+  with GNU ld < 2.36")
+- c1c551bebf92 ("sh: define RUNTIME_DISCARD_EXIT")
+
+Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv")
+Reported-by: SeongJae Park <sj@kernel.org>
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+Tested-by: SeongJae Park <sj@kernel.org>
+Signed-off-by: Richard Weinberger <richard@nod.at>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/um/kernel/vmlinux.lds.S |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/um/kernel/vmlinux.lds.S
++++ b/arch/um/kernel/vmlinux.lds.S
+@@ -1,4 +1,4 @@
+-
++#define RUNTIME_DISCARD_EXIT
+ KERNEL_STACK_SIZE = 4096 * (1 << CONFIG_KERNEL_STACK_ORDER);
+ 
+ #ifdef CONFIG_LD_SCRIPT_STATIC