Diffstat (limited to 'arch/arm/kernel/smp_twd.c')
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index fef42b21cecb..5b150afb995b 100644
@@ -118,10 +118,14 @@ static int twd_cpufreq_transition(struct notifier_block *nb,
* The twd clock events must be reprogrammed to account for the new
* frequency. The timer is local to a cpu, so cross-call to the
* changing cpu.
+ * Only wait for it to finish, if the cpu is active to avoid
+ * deadlock when cpu1 is spinning on while(!cpu_active(cpu1)) during
+ * booting of that cpu.
if (state == CPUFREQ_POSTCHANGE || state == CPUFREQ_RESUMECHANGE)
- NULL, 1);
+ NULL, cpu_active(freqs->cpu));