From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Rapoport Date: Tue, 08 Jun 2021 05:45:07 +0000 Subject: Re: [PATCH v2 8/9] mm: replace CONFIG_NEED_MULTIPLE_NODES with CONFIG_NUMA Message-Id: List-Id: References: <20210604064916.26580-1-rppt@kernel.org> <20210604064916.26580-9-rppt@kernel.org> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Geert Uytterhoeven Cc: Andrew Morton , Arnd Bergmann , Ivan Kokshaysky , Jonathan Corbet , Matt Turner , Mike Rapoport , Richard Henderson , Vineet Gupta , kexec@lists.infradead.org, alpha , Linux-Arch , Linux ARM , "open list:DOCUMENTATION" , "linux-ia64@vger.kernel.org" , Linux Kernel Mailing List , linux-m68k , "open list:BROADCOM NVRAM DRIVER" , Linux MM , linux-riscv , linux-s390 , Linux-sh list , arcml , "open list:TENSILICA XTENSA PORT (xtensa)" , linuxppc-dev , sparclinux Hi, On Mon, Jun 07, 2021 at 10:53:08AM +0200, Geert Uytterhoeven wrote: > Hi Mike, > > On Fri, Jun 4, 2021 at 8:50 AM Mike Rapoport wrote: > > From: Mike Rapoport > > > > 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. > > > > Signed-off-by: Mike Rapoport > > Thanks for your patch! > > As you dropped the following hunk from v2 of PATCH 5/9, there's now > one reference left of CONFIG_NEED_MULTIPLE_NODES > (plus the discontigmem comment): Aargh, indeed. Thanks for catching this. And I wondered why you suggested to fix spelling in cover letter for v3 :) > -diff --git a/mm/memory.c b/mm/memory.c > -index f3ffab9b9e39157b..fd0ebb63be3304f5 100644 > ---- a/mm/memory.c > -+++ b/mm/memory.c > -@@ -90,8 +90,7 @@ > - #warning Unfortunate NUMA and NUMA Balancing config, growing > page-frame for last_cpupid. > - #endif > - > --#ifndef CONFIG_NEED_MULTIPLE_NODES > --/* use the per-pgdat data instead for discontigmem - mbligh */ > -+#ifdef CONFIG_FLATMEM > - unsigned long max_mapnr; > - EXPORT_SYMBOL(max_mapnr); > - > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds -- Sincerely yours, Mike.