diff options
| author | Mike Rapoport <rppt@linux.vnet.ibm.com> | 2018-07-04 08:28:16 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2018-07-29 10:48:18 +0200 |
| commit | 1008a11590b966b469e60dc3756c9226a685ce12 (patch) | |
| tree | d85fdc45296edccbb78833ffd69fb81d2cb8251e /arch/m68k/sun3 | |
| parent | m68k/page_no.h: force __va argument to be unsigned long (diff) | |
| download | linux-1008a11590b966b469e60dc3756c9226a685ce12.tar.xz linux-1008a11590b966b469e60dc3756c9226a685ce12.zip | |
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 <rppt@linux.vnet.ibm.com>
Acked-by: Greg Ungerer <gerg@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/sun3')
| -rw-r--r-- | arch/m68k/sun3/config.c | 4 |
1 files changed, 0 insertions, 4 deletions
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)); } |