Skip to content

Commit ed6a75e

Browse files
committed
Merge tag 'riscv-for-linus-6.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fix from Palmer Dabbelt: "Just a single fix this week for a build issue. That'd usually be a good sign, but we've started to get some reports of boot failures on some hardware/bootloader configurations. Nothing concrete yet, but I've got a funny feeling that's where much of the bug hunting is going right now. Nothing's reproducing on my end, though, and this fixes some pretty concrete issues so I figured there's no reason to delay it: - a fix to the linker script to avoid orpahaned sections in kernel/pi" * tag 'riscv-for-linus-6.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: riscv: Fix orphan section warnings caused by kernel/pi
2 parents 47a2ee5 + 3b90b09 commit ed6a75e

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

arch/riscv/kernel/pi/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ KCOV_INSTRUMENT := n
2222

2323
$(obj)/%.pi.o: OBJCOPYFLAGS := --prefix-symbols=__pi_ \
2424
--remove-section=.note.gnu.property \
25-
--prefix-alloc-sections=.init
25+
--prefix-alloc-sections=.init.pi
2626
$(obj)/%.pi.o: $(obj)/%.o FORCE
2727
$(call if_changed,objcopy)
2828

arch/riscv/kernel/vmlinux.lds.S

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,8 @@ SECTIONS
8484
__init_data_begin = .;
8585
INIT_DATA_SECTION(16)
8686

87-
/* Those sections result from the compilation of kernel/pi/string.c */
88-
.init.pidata : {
89-
*(.init.srodata.cst8*)
90-
*(.init__bug_table*)
91-
*(.init.sdata*)
87+
.init.pi : {
88+
*(.init.pi*)
9289
}
9390

9491
.init.bss : {

0 commit comments

Comments
 (0)