Merge tag 'riscv-for-linus-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux (8a5f78d9) · Commits · 戴 / test

Pull RISC-V fixes from Palmer Dabbelt: "Two fixes this week: - A fix to actually reserve the device tree's memory. Without this the device tree can be overwritten on systems that don't otherwise reserve it. This issue should only manifest on !MMU systems. - A workaround for a BUG() that triggers when the memory that originally contained initdata is freed and later repurposed. This triggers a BUG() on builds that had HARDENED_USERCOPY enabled" * tag 'riscv-for-linus-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: riscv: Fixup bootup failure with HARDENED_USERCOPY RISC-V: Make sure memblock reserves the memory containing DT

arch/riscv/kernel/vmlinux.lds.S

+3 −2

Original line number	Diff line number	Diff line
		@@ -22,13 +22,11 @@ SECTIONS
		/* Beginning of code and text segment */
		. = LOAD_OFFSET;
		_start = .;
		_stext = .;
		HEAD_TEXT_SECTION
		. = ALIGN(PAGE_SIZE);

		__init_begin = .;
		INIT_TEXT_SECTION(PAGE_SIZE)
		INIT_DATA_SECTION(16)
		. = ALIGN(8);
		__soc_early_init_table : {
		__soc_early_init_table_start = .;
		@@ -55,6 +53,7 @@ SECTIONS
		. = ALIGN(SECTION_ALIGN);
		.text : {
		_text = .;
		_stext = .;
		TEXT_TEXT
		SCHED_TEXT
		CPUIDLE_TEXT
		@@ -67,6 +66,8 @@ SECTIONS
		_etext = .;
		}

		INIT_DATA_SECTION(16)

		/* Start of data section */
		_sdata = .;
		RO_DATA(SECTION_ALIGN)

arch/riscv/mm/init.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -515,6 +515,7 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa)
		#else
		dtb_early_va = (void *)dtb_pa;
		#endif
		dtb_early_pa = dtb_pa;
		}

		static inline void setup_vm_final(void)

Admin message