From 1008a11590b966b469e60dc3756c9226a685ce12 Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Wed, 4 Jul 2018 09:28:16 +0300 Subject: m68k: switch to MEMBLOCK + NO_BOOTMEM In m68k the physical memory is described by [memory_start, memory_end] for !MMU variant and by m68k_memory array of memory ranges for the MMU version. This information is directly use to register the physical memory with memblock. The reserve_bootmem() calls are replaced with memblock_reserve() and the bootmap bitmap allocation is simply dropped. Since the MMU variant creates early mappings only for the small part of the memory we force bottom-up allocations in memblock. Signed-off-by: Mike Rapoport Acked-by: Greg Ungerer Signed-off-by: Geert Uytterhoeven --- arch/m68k/sun3/config.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'arch/m68k/sun3') diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c index 1d28d380e8cc..79a2bb857906 100644 --- a/arch/m68k/sun3/config.c +++ b/arch/m68k/sun3/config.c @@ -123,10 +123,6 @@ static void __init sun3_bootmem_alloc(unsigned long memory_start, availmem = memory_start; m68k_setup_node(0); - availmem += init_bootmem(start_page, num_pages); - availmem = (availmem + (PAGE_SIZE-1)) & PAGE_MASK; - - free_bootmem(__pa(availmem), memory_end - (availmem)); } -- cgit