diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-22 12:01:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-22 12:01:41 +0800 |
| commit | 261e8dbdb94baf294d0c8d45de843bb3d928c90e (patch) | |
| tree | 43e9e62c40fd1776ac8763e711bafe14839de724 /drivers/cpufreq | |
| parent | 75dd1c226c98dc1b4ad1bcf78746f4843c3fa1c4 (diff) | |
| parent | a7dd347a67c0ee738dda3c421d82ce8414be8c38 (diff) | |
Merge tag 'v4.4.44' into linux-linaro-lsk-v4.4
This is the 4.4.44 stable release
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/powernv-cpufreq.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c index cb501386eb6e..c4b0ef65988c 100644 --- a/drivers/cpufreq/powernv-cpufreq.c +++ b/drivers/cpufreq/powernv-cpufreq.c @@ -373,8 +373,14 @@ static int powernv_cpufreq_target_index(struct cpufreq_policy *policy, if (unlikely(rebooting) && new_index != get_nominal_index()) return 0; - if (!throttled) + if (!throttled) { + /* we don't want to be preempted while + * checking if the CPU frequency has been throttled + */ + preempt_disable(); powernv_cpufreq_throttle_check(NULL); + preempt_enable(); + } freq_data.pstate_id = powernv_freqs[new_index].driver_data; |