riscv: Move setup_bootmem into paging_init

Make setup_bootmem() static.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>

diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 3b72862..bde8ce3 100644 (file)
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -698,7 +698,6 @@ extern uintptr_t _dtb_early_pa;
 #define dtb_early_pa   _dtb_early_pa
 #endif /* CONFIG_XIP_KERNEL */
 
 #define dtb_early_pa   _dtb_early_pa
 #endif /* CONFIG_XIP_KERNEL */
 

-void setup_bootmem(void);

 void paging_init(void);
 void misc_mem_init(void);
 
 void paging_init(void);
 void misc_mem_init(void);
 

diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index 03901d3..4db4d0b 100644 (file)
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -276,7 +276,6 @@ void __init setup_arch(char **cmdline_p)
        parse_early_param();
 
        efi_init();
        parse_early_param();
 
        efi_init();

-       setup_bootmem();

        paging_init();
 #if IS_ENABLED(CONFIG_BUILTIN_DTB)
        unflatten_and_copy_device_tree();
        paging_init();
 #if IS_ENABLED(CONFIG_BUILTIN_DTB)
        unflatten_and_copy_device_tree();

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 11b61be..dab3171 100644 (file)
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -114,7 +114,7 @@ void __init mem_init(void)
        print_vm_layout();
 }
 
        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);
 {
        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)
 {
 
 void __init paging_init(void)
 {

+       setup_bootmem();

        setup_vm_final();
 }
 
        setup_vm_final();
 }