From: Mike Rapoport <rppt@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Jonathan Corbet <corbet@lwn.net>,
Matt Turner <mattst88@gmail.com>, Mike Rapoport <rppt@kernel.org>,
Mike Rapoport <rppt@linux.ibm.com>,
Richard Henderson <rth@twiddle.net>,
Vineet Gupta <vgupta@synopsys.com>,
kexec@lists.infradead.org, linux-alpha@vger.kernel.org,
linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-doc@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
linux-mips@vger.kernel.org, linux-mm@kvack.org,
linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org,
linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org,
linux-xtensa@linux-xtensa.org, linuxppc-dev@lists.ozlabs.org,
sparclinux@vger.kernel.org
Subject: [PATCH v3 0/9] Remove DISCONTIGMEM memory model
Date: Tue, 8 Jun 2021 12:13:07 +0300 [thread overview]
Message-ID: <20210608091316.3622-1-rppt@kernel.org> (raw)
From: Mike Rapoport <rppt@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.
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/20210604064916.26580-1-rppt@kernel.org
* 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/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
--
2.28.0
next reply other threads:[~2021-06-08 9:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-08 9:13 Mike Rapoport [this message]
2021-06-08 9:13 ` [PATCH v3 1/9] alpha: remove DISCONTIGMEM and NUMA Mike Rapoport
2021-06-08 9:13 ` [PATCH v3 2/9] arc: update comment about HIGHMEM implementation Mike Rapoport
2021-06-08 9:13 ` [PATCH v3 3/9] arc: remove support for DISCONTIGMEM Mike Rapoport
2021-06-08 9:13 ` [PATCH v3 4/9] m68k: " Mike Rapoport
2021-06-08 9:13 ` [PATCH v3 5/9] mm: remove CONFIG_DISCONTIGMEM Mike Rapoport
2021-06-11 20:53 ` Stephen Brennan
2021-06-12 5:43 ` Mike Rapoport
2021-06-08 9:13 ` [PATCH v3 6/9] arch, mm: remove stale mentions of DISCONIGMEM Mike Rapoport
2021-06-08 9:13 ` [PATCH v3 7/9] docs: remove description of DISCONTIGMEM Mike Rapoport
2021-06-08 9:13 ` [PATCH v3 8/9] mm: replace CONFIG_NEED_MULTIPLE_NODES with CONFIG_NUMA Mike Rapoport
2021-06-09 0:25 ` Andrew Morton
2021-06-09 6:52 ` Mike Rapoport
2021-06-08 9:13 ` [PATCH v3 9/9] mm: replace CONFIG_FLAT_NODE_MEM_MAP with CONFIG_FLATMEM Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210608091316.3622-1-rppt@kernel.org \
--to=rppt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=corbet@lwn.net \
--cc=geert@linux-m68k.org \
--cc=ink@jurassic.park.msu.ru \
--cc=kexec@lists.infradead.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mattst88@gmail.com \
--cc=rppt@linux.ibm.com \
--cc=rth@twiddle.net \
--cc=sparclinux@vger.kernel.org \
--cc=vgupta@synopsys.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).