Commit 50f9481e authored by David Hildenbrand's avatar David Hildenbrand Committed by Linus Torvalds
Browse files

mm/memory_hotplug: remove CONFIG_MEMORY_HOTPLUG_SPARSE 

CONFIG_MEMORY_HOTPLUG depends on CONFIG_SPARSEMEM, so there is no need for
CONFIG_MEMORY_HOTPLUG_SPARSE anymore; adjust all instances to use
CONFIG_MEMORY_HOTPLUG and remove CONFIG_MEMORY_HOTPLUG_SPARSE.

Link: https://lkml.kernel.org/r/20210929143600.49379-3-david@redhat.com


Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: Shuah Khan <skhan@linuxfoundation.org>	[kselftest]
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarOscar Salvador <osalvador@suse.de>
Cc: Alex Shi <alexs@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 71b6f2dd

arch/powerpc/include/asm/machdep.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct machdep_calls { 
	void		(*iommu_save)(void);

	void		(*iommu_restore)(void);

#endif

#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE

#ifdef CONFIG_MEMORY_HOTPLUG

	unsigned long	(*memory_block_size)(void);

#endif

#endif /* CONFIG_PPC64 */

arch/powerpc/kernel/setup_64.c

+1 −1
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ void __init setup_per_cpu_areas(void) 
}

#endif



#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE

#ifdef CONFIG_MEMORY_HOTPLUG

unsigned long memory_block_size_bytes(void)

{

	if (ppc_md.memory_block_size)

arch/powerpc/platforms/powernv/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ static void pnv_kexec_cpu_down(int crash_shutdown, int secondary) 
}

#endif /* CONFIG_KEXEC_CORE */



#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE

#ifdef CONFIG_MEMORY_HOTPLUG

static unsigned long pnv_memory_block_size(void)

{

	/*
@@ -553,7 +553,7 @@ define_machine(powernv) { 
#ifdef CONFIG_KEXEC_CORE

	.kexec_cpu_down		= pnv_kexec_cpu_down,

#endif

#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE

#ifdef CONFIG_MEMORY_HOTPLUG

	.memory_block_size	= pnv_memory_block_size,

#endif

};

arch/powerpc/platforms/pseries/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ define_machine(pseries) { 
	.machine_kexec          = pSeries_machine_kexec,

	.kexec_cpu_down         = pseries_kexec_cpu_down,

#endif

#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE

#ifdef CONFIG_MEMORY_HOTPLUG

	.memory_block_size	= pseries_memory_block_size,

#endif

};

drivers/base/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ obj-y += power/ 
obj-$(CONFIG_ISA_BUS_API)	+= isa.o

obj-y				+= firmware_loader/

obj-$(CONFIG_NUMA)	+= node.o

obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o

obj-$(CONFIG_MEMORY_HOTPLUG) += memory.o

ifeq ($(CONFIG_SYSFS),y)

obj-$(CONFIG_MODULES)	+= module.o

endif