Revert "hrtimers: Handle CPU state correctly on hotplug"
Causes sleep of death.
This reverts commit 95e4f62df2.
Change-Id: Id3e5f5a71b7d2d57aaa1b9bba7b4ef02221bdba7
This commit is contained in:
@@ -534,7 +534,6 @@ extern void __init hrtimers_init(void);
|
||||
extern void sysrq_timer_list_show(void);
|
||||
|
||||
int hrtimers_prepare_cpu(unsigned int cpu);
|
||||
int hrtimers_cpu_starting(unsigned int cpu);
|
||||
#ifdef CONFIG_HOTPLUG_CPU
|
||||
int hrtimers_dead_cpu(unsigned int cpu);
|
||||
#else
|
||||
|
||||
@@ -2073,15 +2073,6 @@ int hrtimers_prepare_cpu(unsigned int cpu)
|
||||
}
|
||||
|
||||
cpu_base->cpu = cpu;
|
||||
hrtimer_cpu_base_init_expiry_lock(cpu_base);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int hrtimers_cpu_starting(unsigned int cpu)
|
||||
{
|
||||
struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases);
|
||||
|
||||
/* Clear out any left over state from a CPU down operation */
|
||||
cpu_base->active_bases = 0;
|
||||
cpu_base->hres_active = 0;
|
||||
cpu_base->hang_detected = 0;
|
||||
@@ -2089,6 +2080,7 @@ int hrtimers_cpu_starting(unsigned int cpu)
|
||||
cpu_base->softirq_next_timer = NULL;
|
||||
cpu_base->expires_next = KTIME_MAX;
|
||||
cpu_base->softirq_expires_next = KTIME_MAX;
|
||||
hrtimer_cpu_base_init_expiry_lock(cpu_base);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -2206,7 +2198,6 @@ void hrtimer_quiesce_cpu(void *cpup)
|
||||
void __init hrtimers_init(void)
|
||||
{
|
||||
hrtimers_prepare_cpu(smp_processor_id());
|
||||
hrtimers_cpu_starting(smp_processor_id());
|
||||
open_softirq(HRTIMER_SOFTIRQ, hrtimer_run_softirq);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user