diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2021-04-29 22:53:45 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-30 11:20:35 -0700 |
| commit | 9187592b96385e5060dfb2b182aa9ec93d5c0332 (patch) | |
| tree | fe15b3711a4365a8fe7f0e57000c4625b706c5b8 /arch/ia64/mm/contig.c | |
| parent | ia64: mca: always make IA64_MCA_DEBUG an expression (diff) | |
| download | linux-dev-9187592b96385e5060dfb2b182aa9ec93d5c0332.tar.xz linux-dev-9187592b96385e5060dfb2b182aa9ec93d5c0332.zip | |
ia64: drop marked broken DISCONTIGMEM and VIRTUAL_MEM_MAP
DISCONTIGMEM was marked BROKEN in 5.11. Let's remove it.
Booted SPARSEMEM successfully on rx3600.
Link: https://lkml.kernel.org/r/20210404193440.2615358-1-slyfox@gentoo.org
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64/mm/contig.c')
| -rw-r--r-- | arch/ia64/mm/contig.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c index 62fe80a16f42..42e025cfbd08 100644 --- a/arch/ia64/mm/contig.c +++ b/arch/ia64/mm/contig.c @@ -153,11 +153,7 @@ find_memory (void) efi_memmap_walk(find_max_min_low_pfn, NULL); max_pfn = max_low_pfn; -#ifdef CONFIG_VIRTUAL_MEM_MAP - efi_memmap_walk(filter_memory, register_active_ranges); -#else memblock_add_node(0, PFN_PHYS(max_low_pfn), 0); -#endif find_initrd(); |