From: Greg Kroah-Hartman Date: Thu, 7 Sep 2023 14:47:58 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v6.1.53~136 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7dea92fa870cad7e3f44f603ed528c3b87367b1b;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: powerpc-32-include-.branch_lt-in-data-section.patch powerpc-32s-fix-assembler-warning-about-r0.patch --- diff --git a/queue-4.19/powerpc-32-include-.branch_lt-in-data-section.patch b/queue-4.19/powerpc-32-include-.branch_lt-in-data-section.patch new file mode 100644 index 00000000000..72543818a7d --- /dev/null +++ b/queue-4.19/powerpc-32-include-.branch_lt-in-data-section.patch @@ -0,0 +1,41 @@ +From 98ecc6768e8fdba95da1fc1efa0ef2d769e7fe1c Mon Sep 17 00:00:00 2001 +From: Joel Stanley +Date: Wed, 14 Nov 2018 13:32:18 +1030 +Subject: powerpc/32: Include .branch_lt in data section + +From: Joel Stanley + +commit 98ecc6768e8fdba95da1fc1efa0ef2d769e7fe1c upstream. + +When building a 32 bit powerpc kernel with Binutils 2.31.1 this warning +is emitted: + + powerpc-linux-gnu-ld: warning: orphan section `.branch_lt' from + `arch/powerpc/kernel/head_44x.o' being placed in section `.branch_lt' + +As of binutils commit 2d7ad24e8726 ("Support PLT16 relocs against local +symbols")[1], 32 bit targets can produce .branch_lt sections in their +output. + +Include these symbols in the .data section as the ppc64 kernel does. + +[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=2d7ad24e8726ba4c45c9e67be08223a146a837ce +Signed-off-by: Joel Stanley +Reviewed-by: Alan Modra +Signed-off-by: Michael Ellerman +Cc: Christophe Leroy +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/kernel/vmlinux.lds.S | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/powerpc/kernel/vmlinux.lds.S ++++ b/arch/powerpc/kernel/vmlinux.lds.S +@@ -328,6 +328,7 @@ SECTIONS + *(.sdata2) + *(.got.plt) *(.got) + *(.plt) ++ *(.branch_lt) + } + #else + .data : AT(ADDR(.data) - LOAD_OFFSET) { diff --git a/queue-4.19/powerpc-32s-fix-assembler-warning-about-r0.patch b/queue-4.19/powerpc-32s-fix-assembler-warning-about-r0.patch new file mode 100644 index 00000000000..9a6cd0ba1f7 --- /dev/null +++ b/queue-4.19/powerpc-32s-fix-assembler-warning-about-r0.patch @@ -0,0 +1,37 @@ +From b51ba4fe2e134b631f9c8f45423707aab71449b5 Mon Sep 17 00:00:00 2001 +From: Christophe Leroy +Date: Thu, 6 Aug 2020 06:01:42 +0000 +Subject: powerpc/32s: Fix assembler warning about r0 + +From: Christophe Leroy + +commit b51ba4fe2e134b631f9c8f45423707aab71449b5 upstream. + +The assembler says: + arch/powerpc/kernel/head_32.S:1095: Warning: invalid register expression + +It's objecting to the use of r0 as the RA argument. That's because +when RA = 0 the literal value 0 is used, rather than the content of +r0, making the use of r0 in the source potentially confusing. + +Fix it to use a literal 0, the generated code is identical. + +Signed-off-by: Christophe Leroy +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/2b69ac8e1cddff6f808fc7415907179eab4aae9e.1596693679.git.christophe.leroy@csgroup.eu +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/kernel/head_32.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/powerpc/kernel/head_32.S ++++ b/arch/powerpc/kernel/head_32.S +@@ -987,7 +987,7 @@ start_here: + */ + lis r5, abatron_pteptrs@h + ori r5, r5, abatron_pteptrs@l +- stw r5, 0xf0(r0) /* This much match your Abatron config */ ++ stw r5, 0xf0(0) /* This much match your Abatron config */ + lis r6, swapper_pg_dir@h + ori r6, r6, swapper_pg_dir@l + tophys(r5, r5) diff --git a/queue-4.19/series b/queue-4.19/series index 2a12eb0ba97..361f41dc4dc 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -34,3 +34,5 @@ sctp-handle-invalid-error-codes-without-calling-bug.patch cifs-add-a-warning-when-the-in-flight-count-goes-neg.patch alsa-seq-oss-fix-racy-open-close-of-midi-devices.patch net-avoid-address-overwrite-in-kernel_connect.patch +powerpc-32-include-.branch_lt-in-data-section.patch +powerpc-32s-fix-assembler-warning-about-r0.patch