Skip to content

Commit

Permalink
arc: remove support for DISCONTIGMEM
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
rppt authored and torvalds committed Jun 29, 2021
1 parent e7793e5 commit 8b793b4
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 61 deletions.
13 changes: 0 additions & 13 deletions arch/arc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ config SCHED_OMIT_FRAME_POINTER
config GENERIC_CSUM
def_bool y

config ARCH_DISCONTIGMEM_ENABLE
def_bool n
depends on BROKEN

config ARCH_FLATMEM_ENABLE
def_bool y

Expand Down Expand Up @@ -344,15 +340,6 @@ config ARC_HUGEPAGE_16M

endchoice

config NODES_SHIFT
int "Maximum NUMA Nodes (as a power of 2)"
default "0" if !DISCONTIGMEM
default "1" if DISCONTIGMEM
depends on NEED_MULTIPLE_NODES
help
Accessing memory beyond 1GB (with or w/o PAE) requires 2 memory
zones.

config ARC_COMPACT_IRQ_LEVELS
depends on ISA_ARCOMPACT
bool "Setup Timer IRQ as high Priority"
Expand Down
40 changes: 0 additions & 40 deletions arch/arc/include/asm/mmzone.h

This file was deleted.

8 changes: 0 additions & 8 deletions arch/arc/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ unsigned long arch_pfn_offset;
EXPORT_SYMBOL(arch_pfn_offset);
#endif

#ifdef CONFIG_DISCONTIGMEM
struct pglist_data node_data[MAX_NUMNODES] __read_mostly;
EXPORT_SYMBOL(node_data);
#endif

long __init arc_get_mem_sz(void)
{
return low_mem_sz;
Expand Down Expand Up @@ -147,9 +142,6 @@ void __init setup_arch_memory(void)
* to the hole is freed and ARC specific version of pfn_valid()
* handles the hole in the memory map.
*/
#ifdef CONFIG_DISCONTIGMEM
node_set_online(1);
#endif

min_high_pfn = PFN_DOWN(high_mem_start);
max_high_pfn = PFN_DOWN(high_mem_start + high_mem_sz);
Expand Down

0 comments on commit 8b793b4

Please sign in to comment.