Call early_fdt_scan_reserved_mem() in place of early_init_fdt_scan_reserved_mem() to carry out the first stage of the reserved memory processing only. The early_fdt_scan_reserved_mem() function is used to scan through the DT and mark all the reserved memory regions as reserved or nomap as needed, as well as allocate the memory required by the dynamically-placed reserved memory regions. The second stage of the reserved memory processing is done by fdt_init_reserved_mem(). This function is used to store the information of the statically-placed reserved memory nodes in the reserved_mem array as well as call the region specific initialization function on all the stored reserved memory regions. The call to fdt_init_reserved_mem() is placed right after early_fdt_scan_reserved_mem() because memblock allocated memory should be writable at this point. Signed-off-by: Oreoluwa Babatunde <quic_obabatun@xxxxxxxxxxx> --- arch/mips/kernel/setup.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 9c30de151597..13e862151d5f 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -28,6 +28,7 @@ #include <linux/dma-map-ops.h> #include <linux/decompress/generic.h> #include <linux/of_fdt.h> +#include <linux/of_reserved_mem.h> #include <linux/dmi.h> #include <linux/crash_dump.h> @@ -649,7 +650,8 @@ static void __init arch_mem_init(char **cmdline_p) check_kernel_sections_mem(); early_init_fdt_reserve_self(); - early_init_fdt_scan_reserved_mem(); + early_fdt_scan_reserved_mem(); + fdt_init_reserved_mem(); #ifndef CONFIG_NUMA memblock_set_node(0, PHYS_ADDR_MAX, &memblock.memory, 0); -- 2.17.1
