Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
cpufreq
/
powernv-cpufreq.c
diff --git
a/kernel/drivers/cpufreq/powernv-cpufreq.c
b/kernel/drivers/cpufreq/powernv-cpufreq.c
index
cb50138
..
c4b0ef6
100644
(file)
--- a/
kernel/drivers/cpufreq/powernv-cpufreq.c
+++ b/
kernel/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 (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);
powernv_cpufreq_throttle_check(NULL);
+ preempt_enable();
+ }
freq_data.pstate_id = powernv_freqs[new_index].driver_data;
freq_data.pstate_id = powernv_freqs[new_index].driver_data;