Unverified Commit f842f5ff authored by Kefeng Wang's avatar Kefeng Wang Committed by Palmer Dabbelt
Browse files

riscv: Move setup_bootmem into paging_init 



Make setup_bootmem() static.

Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent db756746

arch/riscv/include/asm/pgtable.h

+0 −1
Original line number Diff line number Diff line
@@ -698,7 +698,6 @@ extern uintptr_t _dtb_early_pa; 
#define dtb_early_pa	_dtb_early_pa

#endif /* CONFIG_XIP_KERNEL */



void setup_bootmem(void);

void paging_init(void);

void misc_mem_init(void);

arch/riscv/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -276,7 +276,6 @@ void __init setup_arch(char **cmdline_p) 
	parse_early_param();



	efi_init();

	setup_bootmem();

	paging_init();

#if IS_ENABLED(CONFIG_BUILTIN_DTB)

	unflatten_and_copy_device_tree();

arch/riscv/mm/init.c

+2 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ void __init mem_init(void) 
	print_vm_layout();

}



void __init setup_bootmem(void)

static void __init setup_bootmem(void)

{

	phys_addr_t vmlinux_end = __pa_symbol(&_end);

	phys_addr_t vmlinux_start = __pa_symbol(&_start);
@@ -861,6 +861,7 @@ RESERVEDMEM_OF_DECLARE(elfcorehdr, "linux,elfcorehdr", elfcore_hdr_setup); 


void __init paging_init(void)

{

	setup_bootmem();

	setup_vm_final();

}