Merge tag 'nfs-for-3.15-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / drivers / cpufreq / intel_pstate.c

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index bcb9a6d0ae115fbb50ae369296f142a981fa0ceb..099967302bf25939019875846f7819461a4805c2 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -778,7 +778,7 @@ static void intel_pstate_stop_cpu(struct cpufreq_policy *policy)
 
        pr_info("intel_pstate CPU %d exiting\n", cpu_num);
 
-       del_timer(&all_cpu_data[cpu_num]->timer);
+       del_timer_sync(&all_cpu_data[cpu_num]->timer);
        intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
        kfree(all_cpu_data[cpu_num]);
        all_cpu_data[cpu_num] = NULL;