From: Nikhil Gupta <nikhil.gupta@xxxxxxx> [ Upstream commit 132507ed04ce0c5559be04dd378fec4f3bbc00e8 ] elfcorehdr_addr is fixed address passed to Second kernel which may be conflicted with potential reserved memory in Second kernel,so fdt_reserve_elfcorehdr() ahead of fdt_init_reserved_mem() can relieve this situation. Signed-off-by: Nikhil Gupta <nikhil.gupta@xxxxxxx> Signed-off-by: Rob Herring <robh@xxxxxxxxxx> Link: https://lore.kernel.org/r/20220128042321.15228-1-nikhil.gupta@xxxxxxx Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> --- drivers/of/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 7e868e5995b7e..f66abb496ed16 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -644,8 +644,8 @@ void __init early_init_fdt_scan_reserved_mem(void) } fdt_scan_reserved_mem(); - fdt_init_reserved_mem(); fdt_reserve_elfcorehdr(); + fdt_init_reserved_mem(); } /** -- 2.34.1
