cpu/hotplug: Remove CPU_STARTING and CPU_DYING notifier
All users are converted to state machine, remove CPU_STARTING and the corresponding CPU_DYING. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: rt@linutronix.de Link: http://lkml.kernel.org/r/20160818125731.27256-2-bigeasy@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
30
kernel/cpu.c
30
kernel/cpu.c
@@ -408,12 +408,6 @@ static int notify_online(unsigned int cpu)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int notify_starting(unsigned int cpu)
|
||||
{
|
||||
cpu_notify(CPU_STARTING, cpu);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int bringup_wait_for_ap(unsigned int cpu)
|
||||
{
|
||||
struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
|
||||
@@ -759,12 +753,6 @@ static int notify_down_prepare(unsigned int cpu)
|
||||
return err;
|
||||
}
|
||||
|
||||
static int notify_dying(unsigned int cpu)
|
||||
{
|
||||
cpu_notify(CPU_DYING, cpu);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Take this CPU down. */
|
||||
static int take_cpu_down(void *_param)
|
||||
{
|
||||
@@ -823,7 +811,7 @@ static int takedown_cpu(unsigned int cpu)
|
||||
BUG_ON(cpu_online(cpu));
|
||||
|
||||
/*
|
||||
* The migration_call() CPU_DYING callback will have removed all
|
||||
* The CPUHP_AP_SCHED_MIGRATE_DYING callback will have removed all
|
||||
* runnable tasks from the cpu, there's only the idle task left now
|
||||
* that the migration thread is done doing the stop_machine thing.
|
||||
*
|
||||
@@ -876,7 +864,6 @@ void cpuhp_report_idle_dead(void)
|
||||
#define notify_down_prepare NULL
|
||||
#define takedown_cpu NULL
|
||||
#define notify_dead NULL
|
||||
#define notify_dying NULL
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_HOTPLUG_CPU
|
||||
@@ -966,10 +953,9 @@ EXPORT_SYMBOL(cpu_down);
|
||||
#endif /*CONFIG_HOTPLUG_CPU*/
|
||||
|
||||
/**
|
||||
* notify_cpu_starting(cpu) - call the CPU_STARTING notifiers
|
||||
* notify_cpu_starting(cpu) - Invoke the callbacks on the starting CPU
|
||||
* @cpu: cpu that just started
|
||||
*
|
||||
* This function calls the cpu_chain notifiers with CPU_STARTING.
|
||||
* It must be called by the arch code on the new cpu, before the new cpu
|
||||
* enables interrupts and before the "boot" cpu returns from __cpu_up().
|
||||
*/
|
||||
@@ -1365,18 +1351,6 @@ static struct cpuhp_step cpuhp_ap_states[] = {
|
||||
.startup.single = NULL,
|
||||
.teardown.single = rcutree_dying_cpu,
|
||||
},
|
||||
/*
|
||||
* Low level startup.single/teardown notifiers. Run with interrupts
|
||||
* disabled. Will be removed once the notifiers are converted to
|
||||
* states.
|
||||
*/
|
||||
[CPUHP_AP_NOTIFY_STARTING] = {
|
||||
.name = "notify:starting",
|
||||
.startup.single = notify_starting,
|
||||
.teardown.single = notify_dying,
|
||||
.skip_onerr = true,
|
||||
.cant_stop = true,
|
||||
},
|
||||
/* Entry state on starting. Interrupts enabled from here on. Transient
|
||||
* state for synchronsization */
|
||||
[CPUHP_AP_ONLINE] = {
|
||||
|
Reference in New Issue
Block a user