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

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

Pull RISC-V fix from Palmer Dabbelt:
 "A fix to avoid initializing max_mapnr to be too large, which may
  manifest on NUMA systems"

* tag 'riscv-for-linus-5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: Fixup pfn_valid error with wrong max_mapnr
parents 0e9bcda5 336e8eb2

arch/riscv/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ void __init setup_bootmem(void) 
	max_pfn = PFN_DOWN(dram_end);

	max_low_pfn = max_pfn;

	dma32_phys_limit = min(4UL * SZ_1G, (unsigned long)PFN_PHYS(max_low_pfn));

	set_max_mapnr(max_low_pfn);

	set_max_mapnr(max_low_pfn - ARCH_PFN_OFFSET);



#ifdef CONFIG_BLK_DEV_INITRD

	setup_initrd();