[PATCH v2 0/9] Remove DISCINTIGMEM memory model
Mike Rapoport
rppt at kernel.org
Thu Jun 3 23:49:07 PDT 2021
From: Mike Rapoport <rppt at linux.ibm.com>
Hi,
SPARSEMEM memory model was supposed to entirely replace DISCONTIGMEM a
(long) while ago. The last architectures that used DISCONTIGMEM were
updated to use other memory models in v5.11 and it is about the time to
entirely remove DISCONTIGMEM from the kernel.
This set removes DISCONTIGMEM from alpha, arc and m68k, simplifies memory
model selection in mm/Kconfig and replaces usage of redundant
CONFIG_NEED_MULTIPLE_NODES and CONFIG_FLAT_NODE_MEM_MAP with CONFIG_NUMA
and CONFIG_FLATMEM respectively.
I've also removed NUMA support on alpha that was BROKEN for more than 15
years.
There were also minor updates all over arch/ to remove mentions of
DISCONTIGMEM in comments and #ifdefs.
v2:
* Fix build errors reported by kbuild bot
* Add additional cleanups in m68k as suggested by Geert
v1: Link: https://lore.kernel.org/lkml/20210602105348.13387-1-rppt@kernel.org
Mike Rapoport (9):
alpha: remove DISCONTIGMEM and NUMA
arc: update comment about HIGHMEM implementation
arc: remove support for DISCONTIGMEM
m68k: remove support for DISCONTIGMEM
mm: remove CONFIG_DISCONTIGMEM
arch, mm: remove stale mentions of DISCONIGMEM
docs: remove description of DISCONTIGMEM
mm: replace CONFIG_NEED_MULTIPLE_NODES with CONFIG_NUMA
mm: replace CONFIG_FLAT_NODE_MEM_MAP with CONFIG_FLATMEM
Documentation/admin-guide/sysctl/vm.rst | 12 +-
Documentation/vm/memory-model.rst | 45 +----
arch/alpha/Kconfig | 22 ---
arch/alpha/include/asm/machvec.h | 6 -
arch/alpha/include/asm/mmzone.h | 100 -----------
arch/alpha/include/asm/pgtable.h | 4 -
arch/alpha/include/asm/topology.h | 39 -----
arch/alpha/kernel/core_marvel.c | 53 +-----
arch/alpha/kernel/core_wildfire.c | 29 +--
arch/alpha/kernel/pci_iommu.c | 29 ---
arch/alpha/kernel/proto.h | 8 -
arch/alpha/kernel/setup.c | 16 --
arch/alpha/kernel/sys_marvel.c | 5 -
arch/alpha/kernel/sys_wildfire.c | 5 -
arch/alpha/mm/Makefile | 2 -
arch/alpha/mm/init.c | 3 -
arch/alpha/mm/numa.c | 223 ------------------------
arch/arc/Kconfig | 13 --
arch/arc/include/asm/mmzone.h | 40 -----
arch/arc/mm/init.c | 21 +--
arch/arm64/Kconfig | 2 +-
arch/ia64/Kconfig | 2 +-
arch/ia64/kernel/topology.c | 5 +-
arch/ia64/mm/numa.c | 5 +-
arch/m68k/Kconfig.cpu | 10 --
arch/m68k/include/asm/mmzone.h | 10 --
arch/m68k/include/asm/page.h | 2 +-
arch/m68k/include/asm/page_mm.h | 35 ----
arch/m68k/mm/init.c | 20 ---
arch/mips/Kconfig | 2 +-
arch/mips/include/asm/mmzone.h | 8 +-
arch/mips/include/asm/page.h | 2 +-
arch/mips/mm/init.c | 7 +-
arch/nds32/include/asm/memory.h | 6 -
arch/powerpc/Kconfig | 2 +-
arch/powerpc/include/asm/mmzone.h | 4 +-
arch/powerpc/kernel/setup_64.c | 2 +-
arch/powerpc/kernel/smp.c | 2 +-
arch/powerpc/kexec/core.c | 4 +-
arch/powerpc/mm/Makefile | 2 +-
arch/powerpc/mm/mem.c | 4 +-
arch/riscv/Kconfig | 2 +-
arch/s390/Kconfig | 2 +-
arch/sh/include/asm/mmzone.h | 4 +-
arch/sh/kernel/topology.c | 2 +-
arch/sh/mm/Kconfig | 2 +-
arch/sh/mm/init.c | 2 +-
arch/sparc/Kconfig | 2 +-
arch/sparc/include/asm/mmzone.h | 4 +-
arch/sparc/kernel/smp_64.c | 2 +-
arch/sparc/mm/init_64.c | 12 +-
arch/x86/Kconfig | 2 +-
arch/x86/kernel/setup_percpu.c | 6 +-
arch/x86/mm/init_32.c | 4 +-
arch/xtensa/include/asm/page.h | 4 -
include/asm-generic/memory_model.h | 37 +---
include/asm-generic/topology.h | 2 +-
include/linux/gfp.h | 4 +-
include/linux/memblock.h | 6 +-
include/linux/mm.h | 4 +-
include/linux/mmzone.h | 20 ++-
kernel/crash_core.c | 4 +-
mm/Kconfig | 36 +---
mm/memblock.c | 8 +-
mm/page_alloc.c | 25 +--
mm/page_ext.c | 2 +-
66 files changed, 100 insertions(+), 909 deletions(-)
delete mode 100644 arch/alpha/include/asm/mmzone.h
delete mode 100644 arch/alpha/mm/numa.c
delete mode 100644 arch/arc/include/asm/mmzone.h
delete mode 100644 arch/m68k/include/asm/mmzone.h
base-commit: c4681547bcce777daf576925a966ffa824edd09d
--
2.28.0
More information about the linux-riscv
mailing list