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

torvalds · torvalds · commit 712fb83dc3f6 · 2022-11-20T09:47:33.000-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
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ SECTIONS`
`142`	`142`	`#endif`
`143`	`143`
`144`	`144`	`.data.rel.ro : AT(ADDR(.data.rel.ro) - LOAD_OFFSET) {`
`145`		`- (.data.rel.ro)`
	`145`	`+ (.data.rel.ro .data.rel.ro.)`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`.branch_lt : AT(ADDR(.branch_lt) - LOAD_OFFSET) {`