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: Thomas Gleixner <tglx@linutronix.de>
Acked-by: David Rientjes <rientjes@google.com>
Tested-by: David Rientjes <rientjes@google.com>
Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Tested-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
index d305db70674bb539564fda04b226be40ac6acbbd..07cb8f7030b67309677d8d1b4943b7e84117bda3 100644 (file)
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -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,

diff --git a/include/linux/slab.h b/include/linux/slab.h
index d6d6ffeeb9a2af2f3ff497b48c08e2c19f8d0efb..34e43cddc520f7f73aac914be4f3e4f21b4fb8e4 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -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 */

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 9e4c6780adde8f71c9ad14ba3c312e865ac3485d..530b026d95a14b8e213f51bd7f0ce9e4ed4de674 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -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,