tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'riscv-for-linus-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

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

Linus Torvalds 8a5f78d9 277e570a

options
unified split
Changed files
+4 -2
arch
riscv
kernel
vmlinux.lds.S
mm
init.c
+3 -2
arch/riscv/kernel/vmlinux.lds.S
··· 22 22 /* Beginning of code and text segment */ 23 23 . = LOAD_OFFSET; 24 24 _start = .; 25 - _stext = .; 26 25 HEAD_TEXT_SECTION 27 26 . = ALIGN(PAGE_SIZE); 28 27 29 28 __init_begin = .; 30 29 INIT_TEXT_SECTION(PAGE_SIZE) 31 - INIT_DATA_SECTION(16) 32 30 . = ALIGN(8); 33 31 __soc_early_init_table : { 34 32 __soc_early_init_table_start = .; ··· 53 55 . = ALIGN(SECTION_ALIGN); 54 56 .text : { 55 57 _text = .; 58 + _stext = .; 56 59 TEXT_TEXT 57 60 SCHED_TEXT 58 61 CPUIDLE_TEXT ··· 65 66 *(.fixup) 66 67 _etext = .; 67 68 } 69 + 70 + INIT_DATA_SECTION(16) 68 71 69 72 /* Start of data section */ 70 73 _sdata = .;
+1
arch/riscv/mm/init.c
··· 515 515 #else 516 516 dtb_early_va = (void *)dtb_pa; 517 517 #endif 518 + dtb_early_pa = dtb_pa; 518 519 } 519 520 520 521 static inline void setup_vm_final(void)