Re: [PATCH 2/2] arch/sh: Drop support for memory-hotplug and memory-hotremove

[John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>]

On Sat, 2024-05-18 at 13:58 +0200, Oscar Salvador wrote:
> Remove all CONFIG options related to memory-hotplug and memory-hotremove.
> 
> Signed-off-by: Oscar Salvador <osalvador@suse.de>
> ---
>  arch/sh/Kconfig                     | 2 --
>  arch/sh/configs/apsh4ad0a_defconfig | 2 --
>  arch/sh/configs/sdk7786_defconfig   | 2 --
>  arch/sh/configs/shx3_defconfig      | 2 --
>  arch/sh/mm/Kconfig                  | 4 ----
>  5 files changed, 12 deletions(-)
> 
> diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
> index 6bc60f964f96..c5c093c73aa1 100644
> --- a/arch/sh/Kconfig
> +++ b/arch/sh/Kconfig
> @@ -3,8 +3,6 @@ config SUPERH
>  	def_bool y
>  	select ARCH_32BIT_OFF_T
>  	select ARCH_HAS_CPU_CACHE_ALIASING
> -	select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM && MMU
> -	select ARCH_ENABLE_MEMORY_HOTREMOVE if SPARSEMEM && MMU
>  	select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)
>  	select ARCH_HAS_BINFMT_FLAT if !MMU
>  	select ARCH_HAS_CPU_FINALIZE_INIT
> diff --git a/arch/sh/configs/apsh4ad0a_defconfig b/arch/sh/configs/apsh4ad0a_defconfig
> index 64558bf60e10..19ed0601a36f 100644
> --- a/arch/sh/configs/apsh4ad0a_defconfig
> +++ b/arch/sh/configs/apsh4ad0a_defconfig
> @@ -24,8 +24,6 @@ CONFIG_BFQ_GROUP_IOSCHED=y
>  CONFIG_CPU_SUBTYPE_SH7786=y
>  CONFIG_MEMORY_SIZE=0x10000000
>  CONFIG_HUGETLB_PAGE_SIZE_1MB=y
> -CONFIG_MEMORY_HOTPLUG=y
> -CONFIG_MEMORY_HOTREMOVE=y
>  CONFIG_KSM=y
>  CONFIG_SH_STORE_QUEUES=y
>  CONFIG_SH_APSH4AD0A=y
> diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig
> index 7b427c17fbfe..07894f13441e 100644
> --- a/arch/sh/configs/sdk7786_defconfig
> +++ b/arch/sh/configs/sdk7786_defconfig
> @@ -43,8 +43,6 @@ CONFIG_MEMORY_SIZE=0x20000000
>  CONFIG_PMB=y
>  CONFIG_NUMA=y
>  CONFIG_HUGETLB_PAGE_SIZE_64MB=y
> -CONFIG_MEMORY_HOTPLUG=y
> -CONFIG_MEMORY_HOTREMOVE=y
>  CONFIG_KSM=y
>  CONFIG_SH_STORE_QUEUES=y
>  CONFIG_SPECULATIVE_EXECUTION=y
> diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig
> index aa353dff7f19..9a0df5ea3866 100644
> --- a/arch/sh/configs/shx3_defconfig
> +++ b/arch/sh/configs/shx3_defconfig
> @@ -31,8 +31,6 @@ CONFIG_CPU_SUBTYPE_SHX3=y
>  CONFIG_MEMORY_START=0x0c000000
>  CONFIG_NUMA=y
>  CONFIG_PAGE_SIZE_64KB=y
> -CONFIG_MEMORY_HOTPLUG=y
> -CONFIG_MEMORY_HOTREMOVE=y
>  CONFIG_SH_STORE_QUEUES=y
>  CONFIG_SH_X3PROTO=y
>  CONFIG_NO_HZ=y
> diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
> index f32a1963ff0c..1862411665ab 100644
> --- a/arch/sh/mm/Kconfig
> +++ b/arch/sh/mm/Kconfig
> @@ -144,10 +144,6 @@ config ARCH_SPARSEMEM_DEFAULT
>  config ARCH_SELECT_MEMORY_MODEL
>  	def_bool y
>  
> -config ARCH_MEMORY_PROBE
> -	def_bool y
> -	depends on MEMORY_HOTPLUG
> -
>  config IOREMAP_FIXED
>         def_bool y
>         depends on X2TLB

Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

Will pick this up later today.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer
`. `'   Physicist
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913