Commit a9ee6cf5 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

mm: replace CONFIG_NEED_MULTIPLE_NODES with CONFIG_NUMA 

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.

[rppt@linux.ibm.com: fix arm boot crash]
  Link: https://lkml.kernel.org/r/YMj9vHhHOiCVN4BF@linux.ibm.com

Link: https://lkml.kernel.org/r/20210608091316.3622-9-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 48d9f335

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ config NODES_SHIFT 
	int "Maximum NUMA Nodes (as a power of 2)"

	range 1 10

	default "4"

	depends on NEED_MULTIPLE_NODES

	depends on NUMA

	help

	  Specify the maximum number of NUMA Nodes available on the target

	  system.  Increases memory reserved to accommodate various tables.

arch/ia64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ config NODES_SHIFT 
	int "Max num nodes shift(3-10)"

	range 3 10

	default "10"

	depends on NEED_MULTIPLE_NODES

	depends on NUMA

	help

	  This option specifies the maximum number of nodes in your SSI system.

	  MAX_NUMNODES will be 2^(This value).

arch/mips/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2867,7 +2867,7 @@ config RANDOMIZE_BASE_MAX_OFFSET 
config NODES_SHIFT

	int

	default "6"

	depends on NEED_MULTIPLE_NODES

	depends on NUMA



config HW_PERF_EVENTS

	bool "Enable hardware performance counter support for perf events"

arch/mips/include/asm/mmzone.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#include <asm/page.h>



#ifdef CONFIG_NEED_MULTIPLE_NODES

#ifdef CONFIG_NUMA

# include <mmzone.h>

#endif

arch/mips/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static inline int pfn_valid(unsigned long pfn) 


/* pfn_valid is defined in linux/mmzone.h */



#elif defined(CONFIG_NEED_MULTIPLE_NODES)

#elif defined(CONFIG_NUMA)



#define pfn_valid(pfn)							\

({									\