summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-11-20 09:47:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2022-11-20 09:47:33 -0800
commit712fb83dc3f688458ae91bb0a5c706b239ab4684 (patch)
treee23f38e8636ba7dcb9e61d9a13a63d1c4b0572ff
parent77c51ba552a1c4f73228766e43ae37c4101b3758 (diff)
parenteb761a1760bf30cf64e98ee8d914866e62ec9e8a (diff)
downloadlinux-712fb83dc3f688458ae91bb0a5c706b239ab4684.tar.gz
linux-712fb83dc3f688458ae91bb0a5c706b239ab4684.tar.bz2
linux-712fb83dc3f688458ae91bb0a5c706b239ab4684.zip
Merge tag 'powerpc-6.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
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
-rw-r--r--arch/powerpc/kernel/vmlinux.lds.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 7786e3ac7611..8c3862b4c259 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) {