Commit 91024b3c authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Linus Torvalds
Browse files

mm: generalize ARCH_ENABLE_MEMORY_[HOTPLUG|HOTREMOVE] 

ARCH_ENABLE_MEMORY_[HOTPLUG|HOTREMOVE] configs have duplicate
definitions on platforms that subscribe them.  Instead, just make them
generic options which can be selected on applicable platforms.

Link: https://lkml.kernel.org/r/1617259448-22529-4-git-send-email-anshuman.khandual@arm.com


Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>	[arm64]
Acked-by: Heiko Carstens <hca@linux.ibm.com>		[s390]
Cc: Will Deacon <will@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Palmer Dabbelt <palmerdabbelt@google.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
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 855f9a8e

arch/arm64/Kconfig

+2 −6
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ config ARM64 
	select ACPI_PPTT if ACPI

	select ARCH_HAS_DEBUG_WX

	select ARCH_BINFMT_ELF_STATE

	select ARCH_ENABLE_MEMORY_HOTPLUG

	select ARCH_ENABLE_MEMORY_HOTREMOVE

	select ARCH_HAS_CACHE_LINE_SIZE

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEBUG_VM_PGTABLE
@@ -311,12 +313,6 @@ config ZONE_DMA32 
	bool "Support DMA32 zone" if EXPERT

	default y



config ARCH_ENABLE_MEMORY_HOTPLUG

	def_bool y



config ARCH_ENABLE_MEMORY_HOTREMOVE

	def_bool y



config SMP

	def_bool y

arch/ia64/Kconfig

+2 −6
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ config IA64 
	select ARCH_MIGHT_HAVE_PC_SERIO

	select ACPI

	select ACPI_NUMA if NUMA

	select ARCH_ENABLE_MEMORY_HOTPLUG

	select ARCH_ENABLE_MEMORY_HOTREMOVE

	select ARCH_SUPPORTS_ACPI

	select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI

	select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
@@ -246,12 +248,6 @@ config HOTPLUG_CPU 
	  can be controlled through /sys/devices/system/cpu/cpu#.

	  Say N if you want to disable CPU hotplug.



config ARCH_ENABLE_MEMORY_HOTPLUG

	def_bool y



config ARCH_ENABLE_MEMORY_HOTREMOVE

	def_bool y



config SCHED_SMT

	bool "SMT scheduler support"

	depends on SMP

arch/powerpc/Kconfig

+2 −6
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ config PPC 
	# Please keep this list sorted alphabetically.

	#

	select ARCH_32BIT_OFF_T if PPC32

	select ARCH_ENABLE_MEMORY_HOTPLUG

	select ARCH_ENABLE_MEMORY_HOTREMOVE

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE
@@ -512,12 +514,6 @@ config ARCH_CPU_PROBE_RELEASE 
	def_bool y

	depends on HOTPLUG_CPU



config ARCH_ENABLE_MEMORY_HOTPLUG

	def_bool y



config ARCH_ENABLE_MEMORY_HOTREMOVE

	def_bool y



config PPC64_SUPPORTS_MEMORY_FAILURE

	bool "Add support for memory hwpoison"

	depends on PPC_BOOK3S_64

arch/s390/Kconfig

+2 −6
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ config S390 
	imply IMA_SECURE_AND_OR_TRUSTED_BOOT

	select ARCH_32BIT_USTAT_F_TINODE

	select ARCH_BINFMT_ELF_STATE

	select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM

	select ARCH_ENABLE_MEMORY_HOTREMOVE

	select ARCH_HAS_DEBUG_VM_PGTABLE

	select ARCH_HAS_DEBUG_WX

	select ARCH_HAS_DEVMEM_IS_ALLOWED
@@ -626,12 +628,6 @@ config ARCH_SPARSEMEM_ENABLE 
config ARCH_SPARSEMEM_DEFAULT

	def_bool y



config ARCH_ENABLE_MEMORY_HOTPLUG

	def_bool y if SPARSEMEM



config ARCH_ENABLE_MEMORY_HOTREMOVE

	def_bool y



config ARCH_ENABLE_SPLIT_PMD_PTLOCK

	def_bool y

arch/sh/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
config SUPERH

	def_bool y

	select ARCH_32BIT_OFF_T

	select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM && MMU

	select ARCH_ENABLE_MEMORY_HOTREMOVE if SPARSEMEM && MMU

	select ARCH_HAVE_CUSTOM_GPIO_H

	select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)

	select ARCH_HAS_BINFMT_FLAT if !MMU