1 files changed, 14 insertions, 5 deletions

diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
index 9004450863be..1b44496b2d2b 100644
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@ -131,15 +131,25 @@ void dbs_check_cpu(struct dbs_data *dbs_data, int cpu)
                  * timer would not have fired during CPU-idle periods. Hence
                  * an unusually large 'wall_time' (as compared to the sampling
                  * rate) indicates this scenario.
+                 *
+                 * prev_load can be zero in two cases and we must recalculate it
+                 * for both cases:
+                 * - during long idle intervals
+                 * - explicitly set to zero
                  */
-                if (unlikely(wall_time > (2 * sampling_rate)) &&
-                                                j_cdbs->copy_prev_load) {
+                if (unlikely(wall_time > (2 * sampling_rate) &&
+                             j_cdbs->prev_load)) {
                         load = j_cdbs->prev_load;
-                        j_cdbs->copy_prev_load = false;
+
+                        /*
+                         * Perform a destructive copy, to ensure that we copy
+                         * the previous load only once, upon the first wake-up
+                         * from idle.
+                         */
+                        j_cdbs->prev_load = 0;
                 } else {
                         load = 100 * (wall_time - idle_time) / wall_time;
                         j_cdbs->prev_load = load;
-                        j_cdbs->copy_prev_load = true;
                 }
 
                 if (load > max_load)
@@ -373,7 +383,6 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                                 (j_cdbs->prev_cpu_wall - j_cdbs->prev_cpu_idle);
                         j_cdbs->prev_load = 100 * prev_load /
                                         (unsigned int) j_cdbs->prev_cpu_wall;
-                        j_cdbs->copy_prev_load = true;
 
                         if (ignore_nice)
                                 j_cdbs->prev_cpu_nice =