projects/linux·commit 712fb83d

Merge tag 'powerpc-6.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

712fb83d · Linus Torvalds <[email protected]> · 2022-11-20 09:47:33 -08:00

Pull powerpc fix from Michael Ellerman:

 - Fix writable sections being moved into the rodata region.

Thanks to Nicholas Piggin and Christophe Leroy.

* tag 'powerpc-6.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc: Fix writable sections being moved into the rodata region
Commit
712fb83dc3f688458ae91bb0a5c706b239ab4684
Parents
77c51ba5 · eb761a17

Merge commit. Changes below are compared with the first parent: 77c51ba5.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
arch/powerpc/kernel/vmlinux.lds.Smodified+1−1View file

arch/powerpc/kernel/vmlinux.lds.S

View file
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 7786e3a..8c3862b 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -142,7 +142,7 @@ SECTIONS
#endif
.data.rel.ro : AT(ADDR(.data.rel.ro) - LOAD_OFFSET) {
- *(.data.rel.ro*)
+ *(.data.rel.ro .data.rel.ro.*)
}
.branch_lt : AT(ADDR(.branch_lt) - LOAD_OFFSET) {