Commit 70da1d01 authored by Vlastimil Babka's avatar Vlastimil Babka
Browse files

cpu/hotplug: remove CPUHP_SLAB_PREPARE hooks 



The CPUHP_SLAB_PREPARE hooks are only used by SLAB which is removed.
SLUB defines them as NULL, so we can remove those altogether.

Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Tested-by: default avatarDavid Rientjes <rientjes@google.com>
Reviewed-by: default avatarHyeonggon Yoo <42.hyeyoo@gmail.com>
Tested-by: default avatarHyeonggon Yoo <42.hyeyoo@gmail.com>
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
parent bc3dcb85

include/linux/cpuhotplug.h

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ enum cpuhp_state { 
	CPUHP_X2APIC_PREPARE,

	CPUHP_SMPCFD_PREPARE,

	CPUHP_RELAY_PREPARE,

	CPUHP_SLAB_PREPARE,

	CPUHP_MD_RAID5_PREPARE,

	CPUHP_RCUTREE_PREP,

	CPUHP_CPUIDLE_COUPLED_PREPARE,

include/linux/slab.h

+0 −8
Original line number Diff line number Diff line
@@ -788,12 +788,4 @@ size_t kmalloc_size_roundup(size_t size); 


void __init kmem_cache_init_late(void);



#if defined(CONFIG_SMP) && defined(CONFIG_SLAB)

int slab_prepare_cpu(unsigned int cpu);

int slab_dead_cpu(unsigned int cpu);

#else

#define slab_prepare_cpu	NULL

#define slab_dead_cpu		NULL

#endif



#endif	/* _LINUX_SLAB_H */

kernel/cpu.c

+0 −5
Original line number Diff line number Diff line
@@ -2125,11 +2125,6 @@ static struct cpuhp_step cpuhp_hp_states[] = { 
		.startup.single		= relay_prepare_cpu,

		.teardown.single	= NULL,

	},

	[CPUHP_SLAB_PREPARE] = {

		.name			= "slab:prepare",

		.startup.single		= slab_prepare_cpu,

		.teardown.single	= slab_dead_cpu,

	},

	[CPUHP_RCUTREE_PREP] = {

		.name			= "RCU/tree:prepare",

		.startup.single		= rcutree_prepare_cpu,