diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-08 21:49:25 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-08 21:49:25 +0200 |
| commit | 85a229f4c729c4de48ba241f77e447c36bbc07f7 (patch) | |
| tree | 924a27434d5846f69b541012494d6ea1f2cb10cf | |
| parent | f991fae5c6d42dfc5029150b05a78cf3f6c18cc9 (diff) | |
| parent | 266c13d767be61a17d8e6f2310b9b7c46278273b (diff) | |
| download | op-kernel-dev-85a229f4c729c4de48ba241f77e447c36bbc07f7.zip op-kernel-dev-85a229f4c729c4de48ba241f77e447c36bbc07f7.tar.gz | |
Merge branch 'pm-fixes'
* pm-fixes:
cpufreq: Fix serialization of frequency transitions
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 7 | ||||
| -rw-r--r-- | include/linux/cpufreq.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 6a015ad..0937b8d 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -312,11 +312,12 @@ static void __cpufreq_notify_transition(struct cpufreq_policy *policy, switch (state) { case CPUFREQ_PRECHANGE: - if (WARN(policy->transition_ongoing, + if (WARN(policy->transition_ongoing == + cpumask_weight(policy->cpus), "In middle of another frequency transition\n")) return; - policy->transition_ongoing = true; + policy->transition_ongoing++; /* detect if the driver reported a value as "old frequency" * which is not equal to what the cpufreq core thinks is @@ -341,7 +342,7 @@ static void __cpufreq_notify_transition(struct cpufreq_policy *policy, "No frequency transition in progress\n")) return; - policy->transition_ongoing = false; + policy->transition_ongoing--; adjust_jiffies(CPUFREQ_POSTCHANGE, freqs); pr_debug("FREQ: %lu - CPU: %lu", (unsigned long)freqs->new, diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 4d7390b..90d5a15 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -119,7 +119,7 @@ struct cpufreq_policy { struct kobject kobj; struct completion kobj_unregister; - bool transition_ongoing; /* Tracks transition status */ + int transition_ongoing; /* Tracks transition status */ }; #define CPUFREQ_ADJUST (0) |
