From 60e1ea55b7a4d1106747e3e5211792b90d1f37d2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 15 Mar 2023 10:00:23 +0100 Subject: [PATCH] 6.2-stable patches added patches: uml-define-runtime_discard_exit.patch --- queue-6.2/series | 1 + .../uml-define-runtime_discard_exit.patch | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 queue-6.2/uml-define-runtime_discard_exit.patch diff --git a/queue-6.2/series b/queue-6.2/series index 748ba423e27..3f501c5937d 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -138,3 +138,4 @@ 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 risc-v-fix-taking-the-text_mutex-twice-during-sifive-errata-patching.patch +uml-define-runtime_discard_exit.patch diff --git a/queue-6.2/uml-define-runtime_discard_exit.patch b/queue-6.2/uml-define-runtime_discard_exit.patch new file mode 100644 index 00000000000..7ca1463d308 --- /dev/null +++ b/queue-6.2/uml-define-runtime_discard_exit.patch @@ -0,0 +1,40 @@ +From b99ddbe8336ee680257c8ab479f75051eaa49dcf Mon Sep 17 00:00:00 2001 +From: Masahiro Yamada +Date: Wed, 8 Feb 2023 01:41:56 +0900 +Subject: UML: define RUNTIME_DISCARD_EXIT + +From: Masahiro Yamada + +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 +Signed-off-by: Masahiro Yamada +Tested-by: SeongJae Park +Signed-off-by: Richard Weinberger +Signed-off-by: Greg Kroah-Hartman +--- + 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 -- 2.47.3