Skip to content

Commit 8b793b4

Browse files
rppttorvalds
authored andcommitted
arc: remove support for DISCONTIGMEM
DISCONTIGMEM was replaced by FLATMEM with freeing of the unused memory map in v5.11. Remove the support for DISCONTIGMEM entirely. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Mike Rapoport <[email protected]> Acked-by: Vineet Gupta <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Acked-by: David Hildenbrand <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Ivan Kokshaysky <[email protected]> Cc: Jonathan Corbet <[email protected]> Cc: Matt Turner <[email protected]> Cc: Richard Henderson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent e7793e5 commit 8b793b4

File tree

3 files changed

+0
-61
lines changed

3 files changed

+0
-61
lines changed

arch/arc/Kconfig

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ config SCHED_OMIT_FRAME_POINTER
6262
config GENERIC_CSUM
6363
def_bool y
6464

65-
config ARCH_DISCONTIGMEM_ENABLE
66-
def_bool n
67-
depends on BROKEN
68-
6965
config ARCH_FLATMEM_ENABLE
7066
def_bool y
7167

@@ -344,15 +340,6 @@ config ARC_HUGEPAGE_16M
344340

345341
endchoice
346342

347-
config NODES_SHIFT
348-
int "Maximum NUMA Nodes (as a power of 2)"
349-
default "0" if !DISCONTIGMEM
350-
default "1" if DISCONTIGMEM
351-
depends on NEED_MULTIPLE_NODES
352-
help
353-
Accessing memory beyond 1GB (with or w/o PAE) requires 2 memory
354-
zones.
355-
356343
config ARC_COMPACT_IRQ_LEVELS
357344
depends on ISA_ARCOMPACT
358345
bool "Setup Timer IRQ as high Priority"

arch/arc/include/asm/mmzone.h

Lines changed: 0 additions & 40 deletions
This file was deleted.

arch/arc/mm/init.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ unsigned long arch_pfn_offset;
3232
EXPORT_SYMBOL(arch_pfn_offset);
3333
#endif
3434

35-
#ifdef CONFIG_DISCONTIGMEM
36-
struct pglist_data node_data[MAX_NUMNODES] __read_mostly;
37-
EXPORT_SYMBOL(node_data);
38-
#endif
39-
4035
long __init arc_get_mem_sz(void)
4136
{
4237
return low_mem_sz;
@@ -147,9 +142,6 @@ void __init setup_arch_memory(void)
147142
* to the hole is freed and ARC specific version of pfn_valid()
148143
* handles the hole in the memory map.
149144
*/
150-
#ifdef CONFIG_DISCONTIGMEM
151-
node_set_online(1);
152-
#endif
153145

154146
min_high_pfn = PFN_DOWN(high_mem_start);
155147
max_high_pfn = PFN_DOWN(high_mem_start + high_mem_sz);

0 commit comments

Comments
 (0)