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/Kconfig | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/m68k/Kconfig') diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 3f61327da2d5..b29f93774d95 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -26,6 +26,9 @@ config M68K select OLD_SIGSUSPEND3 select OLD_SIGACTION select DMA_NONCOHERENT_OPS if HAS_DMA + select HAVE_MEMBLOCK + select ARCH_DISCARD_MEMBLOCK + select NO_BOOTMEM config CPU_BIG_ENDIAN def_bool y -- cgit v1.2.3