Re: [PATCH v3 8/9] mm: replace CONFIG_NEED_MULTIPLE_NODES with CONFIG_NUMA
flat view
From: Andrew Morton <akpm@linux-foundation.org>
Date: 2021-06-09 00:26:06
Also in:
kexec, linux-alpha, linux-arch, linux-arm-kernel, linux-doc, linux-m68k, linux-mips, linux-mm, linux-riscv, linux-s390, linux-sh, lkml, sparclinux
On Tue, 8 Jun 2021 12:13:15 +0300 Mike Rapoport [off-list ref] wrote:
quoted hunk ↗ jump to hunk
From: Mike Rapoport <redacted> After removal of DISCINTIGMEM the NEED_MULTIPLE_NODES and NUMA configuration options are equivalent. Drop CONFIG_NEED_MULTIPLE_NODES and use CONFIG_NUMA instead. Done with $ sed -i 's/CONFIG_NEED_MULTIPLE_NODES/CONFIG_NUMA/' \ $(git grep -wl CONFIG_NEED_MULTIPLE_NODES) $ sed -i 's/NEED_MULTIPLE_NODES/NUMA/' \ $(git grep -wl NEED_MULTIPLE_NODES) with manual tweaks afterwards. ...--- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h@@ -987,7 +987,7 @@ extern int movable_zone; #ifdef CONFIG_HIGHMEM static inline int zone_movable_is_highmem(void) { -#ifdef CONFIG_NEED_MULTIPLE_NODES +#ifdef CONFIG_NUMA return movable_zone == ZONE_HIGHMEM; #else return (ZONE_MOVABLE - 1) == ZONE_HIGHMEM;
I dropped this hunk - your "mm/mmzone.h: simplify is_highmem_idx()" removed zone_movable_is_highmem().