diff options
| author | Nikhil Gupta <nikhil.gupta@nxp.com> | 2019-12-30 15:11:23 +0530 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2020-02-26 04:17:31 +0800 |
| commit | 44f38f3d5d43d270d32bfc7f44797ca582d959e9 (patch) | |
| tree | a508965755610a880bf6a56444f6eebb692f0fe3 /arch/arm64/mm | |
| parent | 1c71dac08f1ca6ceecffaf62daa5d1d3405d5dae (diff) | |
arm64:move elfcorehdr reservation early for crash dump kernel
on some SOCs, elfcorehdr address may overlap with the address of reserved
memory allocated using early_init_fdt_scan_reserved_mem
Signed-off-by: Nikhil Gupta <nikhil.gupta@nxp.com>
Signed-off-by: Poonam Aggrwal <poonam.aggrwal@nxp.com>
(cherry picked from commit 0f7baf2d0e295c5bbafe49ff16c8c551624012b0)
Diffstat (limited to 'arch/arm64/mm')
| -rw-r--r-- | arch/arm64/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 45c00a54909c..2417fbf727c0 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -416,6 +416,8 @@ void __init arm64_memblock_init(void) initrd_end = initrd_start + phys_initrd_size; } + reserve_elfcorehdr(); + early_init_fdt_scan_reserved_mem(); /* 4GB maximum for 32-bit only capable devices */ @@ -426,8 +428,6 @@ void __init arm64_memblock_init(void) reserve_crashkernel(); - reserve_elfcorehdr(); - high_memory = __va(memblock_end_of_DRAM() - 1) + 1; dma_contiguous_reserve(arm64_dma_phys_limit); |