Commit ed6a75e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 47a2ee5d 3b90b09a

arch/riscv/kernel/pi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ KCOV_INSTRUMENT := n 


$(obj)/%.pi.o: OBJCOPYFLAGS := --prefix-symbols=__pi_ \

			       --remove-section=.note.gnu.property \

			       --prefix-alloc-sections=.init

			       --prefix-alloc-sections=.init.pi

$(obj)/%.pi.o: $(obj)/%.o FORCE

	$(call if_changed,objcopy)

arch/riscv/kernel/vmlinux.lds.S

+2 −5
Original line number Diff line number Diff line
@@ -84,11 +84,8 @@ SECTIONS 
	__init_data_begin = .;

	INIT_DATA_SECTION(16)



	/* Those sections result from the compilation of kernel/pi/string.c */

	.init.pidata : {

		*(.init.srodata.cst8*)

		*(.init__bug_table*)

		*(.init.sdata*)

	.init.pi : {

		*(.init.pi*)

	}



	.init.bss : {