All users gone. Signed-off-by: Thomas Gleixner --- include/linux/cpu.h | 6 ------ include/linux/cpuhotplug.h | 1 - kernel/cpu.c | 11 ----------- 3 files changed, 18 deletions(-) Index: linux-2.6/include/linux/cpu.h =================================================================== --- linux-2.6.orig/include/linux/cpu.h +++ linux-2.6/include/linux/cpu.h @@ -60,11 +60,6 @@ extern ssize_t arch_print_cpu_modalias(s #define CPU_DOWN_PREPARE 0x0005 /* CPU (unsigned)v going down */ #define CPU_DOWN_FAILED 0x0006 /* CPU (unsigned)v NOT going down */ #define CPU_DEAD 0x0007 /* CPU (unsigned)v dead */ -#define CPU_DYING 0x0008 /* CPU (unsigned)v not running any task, - * not handling interrupts, soon dead. - * Called on the dying cpu, interrupts - * are already disabled. Must not - * sleep, must not fail */ #define CPU_POST_DEAD 0x0009 /* CPU (unsigned)v dead, cpu_hotplug * lock is dropped */ @@ -79,7 +74,6 @@ extern ssize_t arch_print_cpu_modalias(s #define CPU_DOWN_PREPARE_FROZEN (CPU_DOWN_PREPARE | CPU_TASKS_FROZEN) #define CPU_DOWN_FAILED_FROZEN (CPU_DOWN_FAILED | CPU_TASKS_FROZEN) #define CPU_DEAD_FROZEN (CPU_DEAD | CPU_TASKS_FROZEN) -#define CPU_DYING_FROZEN (CPU_DYING | CPU_TASKS_FROZEN) #ifdef CONFIG_SMP extern bool cpuhp_tasks_frozen; Index: linux-2.6/include/linux/cpuhotplug.h =================================================================== --- linux-2.6.orig/include/linux/cpuhotplug.h +++ linux-2.6/include/linux/cpuhotplug.h @@ -29,7 +29,6 @@ enum cpuhp_states { CPUHP_AP_ARM_VFP_STARTING, CPUHP_AP_ARM64_TIMER_STARTING, CPUHP_AP_KVM_STARTING, - CPUHP_AP_NOTIFY_DYING, CPUHP_AP_CLOCKEVENTS_DYING, CPUHP_AP_RCUTREE_DYING, CPUHP_AP_X86_TBOOT_DYING, Index: linux-2.6/kernel/cpu.c =================================================================== --- linux-2.6.orig/kernel/cpu.c +++ linux-2.6/kernel/cpu.c @@ -303,12 +303,6 @@ static int notify_down_prepare(unsigned return err; } -static int notify_dying(unsigned int cpu) -{ - cpu_notify(CPU_DYING, cpu); - return 0; -} - /* Take this CPU down. */ static int __ref take_cpu_down(void *_param) { @@ -366,7 +360,6 @@ static int notify_dead(unsigned int cpu) #define notify_down_prepare NULL #define takedown_cpu NULL #define notify_dead NULL -#define notify_dying NULL #endif #ifdef CONFIG_HOTPLUG_CPU @@ -825,10 +818,6 @@ static struct cpuhp_step cpuhp_ap_states .startup = sched_starting_cpu, .teardown = NULL, }, - [CPUHP_AP_NOTIFY_DYING] = { - .startup = NULL, - .teardown = notify_dying, - }, [CPUHP_AP_CLOCKEVENTS_DYING] = { .startup = NULL, .teardown = clockevents_dying_cpu,