Merge branch 'pm-fixes'

* pm-fixes:
  cpufreq: Fix serialization of frequency transitions

2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 6a015ada5285..0937b8d6c2a4 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 4d7390bc1727..90d5a15120d5 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)