Remove DISCONTIGMEM memory model
Status from this message: [merged] mm-replace-config_flat_node_mem_map-with-config_flatmem.patch removed from -mm tree
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest9 patches 4 repliesApplied 9/9
- v29 patches 8 repliesSuperseded
- v19 patches 10 repliesSuperseded
Changes in v3 from the cover letter
* Remove stale reference of CONFIG_NEED_MULTIPLE_NODES and stale discontigmem comment, per Geert
* Add Vineet Acks
* Fix spelling in cover letter subject
Patches in v3 All 9 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/9 | alpha: remove DISCONTIGMEM and NUMAarch/ arch/ arch/ +12 more | +4 | 0 replies | Applied |
| 2/9 | arc: update comment about HIGHMEM implementationarch/ | +5 | 0 replies | Applied |
| 3/9 | arc: remove support for DISCONTIGMEMarch/ arch/ arch/ | +0 | 0 replies | Applied |
| 4/9 | m68k: remove support for DISCONTIGMEMarch/ arch/ arch/ +2 more | +1 | 0 replies | Applied |
| 5/9 | mm: remove CONFIG_DISCONTIGMEMinclude/ include/ mm/ +1 more | +12 | 2 replies | Applied |
| 6/9 | arch, mm: remove stale mentions of DISCONIGMEMarch/ arch/ arch/ +4 more | +6 | 0 replies | Applied |
| 7/9 | docs: remove description of DISCONTIGMEMDocumentation/ Documentation/ | +8 | 0 replies | Applied |
| 8/9 | mm: replace CONFIG_NEED_MULTIPLE_NODES with CONFIG_NUMAarch/ arch/ arch/ +32 more | +59 | 2 replies | Applied |
| 9/9 | mm: replace CONFIG_FLAT_NODE_MEM_MAP with CONFIG_FLATMEMinclude/ kernel/ mm/ +2 more | +7 | 0 replies | Applied |
Reviews trailers per patch
3 of 9 patches have a Reviewed-by or Acked-by.
| Patch | Vineet Gupta | Geert Uytterhoeven |
|---|---|---|
| 1/9 | ||
| 2/9 | A-b | |
| 3/9 | A-b | |
| 4/9 | R-b A-b | |
| 5/9 | ||
| 6/9 | ||
| 7/9 | ||
| 8/9 | ||
| 9/9 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v3 0/9] Remove DISCONTIGMEM memory model
From: Mike Rapoport <[email protected]>
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.
v3:
* Remove stale reference of CONFIG_NEED_MULTIPLE_NODES and stale discontigmem comment, per Geert
* Add Vineet Acks
* Fix spelling in cover letter subject
v2: Link: https://lore.kernel.org/lkml/[email protected]
* Fix build errors reported by kbuild bot
* Add additional cleanups in m68k as suggested by Geert
v1: Link: https://lore.kernel.org/lkml/[email protected]
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/memory.c | 3 +- mm/page_alloc.c | 25 +-- mm/page_ext.c | 2 +- 67 files changed, 101 insertions(+), 911 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
Signature · 7 lines
2.28.0 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec