Merge tag 'char-misc-3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[cascardo/linux.git] / drivers / cpufreq / cpufreq_governor.h

diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
index bfb9ae1..cc401d1 100644 (file)
--- a/drivers/cpufreq/cpufreq_governor.h
+++ b/drivers/cpufreq/cpufreq_governor.h
@@ -134,6 +134,13 @@ struct cpu_dbs_common_info {
        u64 prev_cpu_idle;
        u64 prev_cpu_wall;
        u64 prev_cpu_nice;
+       /*
+        * Used to keep track of load in the previous interval. However, when
+        * explicitly set to zero, it is used as a flag to ensure that we copy
+        * the previous load to the current interval only once, upon the first
+        * wake-up from idle.
+        */
+       unsigned int prev_load;
        struct cpufreq_policy *cur_policy;
        struct delayed_work work;
        /*