Unverified Commit 28198c46 authored by Guo Ren's avatar Guo Ren Committed by Palmer Dabbelt
Browse files

riscv: fixup max_low_pfn with PFN_DOWN. 



max_low_pfn should be pfn_size not byte_size.

Signed-off-by: default avatarGuo Ren <ren_guo@c-sky.com>
Signed-off-by: default avatarMao Han <mao_han@c-sky.com>
Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent a19f7470

arch/riscv/kernel/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -181,7 +181,7 @@ static void __init setup_bootmem(void) 
	BUG_ON(mem_size == 0);

	BUG_ON(mem_size == 0);





	set_max_mapnr(PFN_DOWN(mem_size));

	set_max_mapnr(PFN_DOWN(mem_size));

	max_low_pfn = memblock_end_of_DRAM();

	max_low_pfn = PFN_DOWN(memblock_end_of_DRAM());





#ifdef CONFIG_BLK_DEV_INITRD

#ifdef CONFIG_BLK_DEV_INITRD

	setup_initrd();

	setup_initrd();

arch/riscv/mm/init.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,8 @@ static void __init zone_sizes_init(void) 
	unsigned long max_zone_pfns[MAX_NR_ZONES] = { 0, };

	unsigned long max_zone_pfns[MAX_NR_ZONES] = { 0, };





#ifdef CONFIG_ZONE_DMA32

#ifdef CONFIG_ZONE_DMA32

	max_zone_pfns[ZONE_DMA32] = PFN_DOWN(min(4UL * SZ_1G, max_low_pfn));

	max_zone_pfns[ZONE_DMA32] = PFN_DOWN(min(4UL * SZ_1G,

			(unsigned long) PFN_PHYS(max_low_pfn)));

#endif

#endif

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;

CRA Git | Maintained and supported by SUSTech CRA and CCSE