diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 787e27964ab9de8658398bba239be5743e2416c7..9985df83919030a1338ebbf552b148c9882816fe 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -486,8 +486,6 @@ void __init arm64_memblock_init(void) high_memory = __va(memblock_end_of_DRAM() - 1) + 1; dma_contiguous_reserve(arm64_dma_phys_limit); - - memblock_allow_resize(); } void __init bootmem_init(void) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 8080c9f489c3e43af385066514f3f60cca629141..cad24a2551fd29e840fa02ce3099a83ecaf87e28 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -657,6 +657,8 @@ void __init paging_init(void) memblock_free(__pa_symbol(swapper_pg_dir) + PAGE_SIZE, __pa_symbol(swapper_pg_end) - __pa_symbol(swapper_pg_dir) - PAGE_SIZE); + + memblock_allow_resize(); } /*