UPSTREAM: cpufreq: schedutil: Use unsigned int for iowait boost

Make iowait_boost and iowait_boost_max as unsigned int since its unit is kHz
and this is consistent with struct cpufreq_policy. Also change the local
variables in sugov_iowait_boost to match this.

Change-Id: I6c67ed94c57c4bdb24bada4b97045593fcb95d2e
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Joel Fernandes <joelaf@google.com>

diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index f6b95ca..a0bcf48 100644 (file)
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -65,8 +65,8 @@ struct sugov_cpu {
        struct sugov_policy *sg_policy;
 
        bool iowait_boost_pending;
-       unsigned long iowait_boost;
-       unsigned long iowait_boost_max;
+       unsigned int iowait_boost;
+       unsigned int iowait_boost_max;
        u64 last_update;
 
        /* The fields below are only needed when sharing a policy. */
@@ -251,7 +251,7 @@ static void sugov_set_iowait_boost(struct sugov_cpu *sg_cpu, u64 time,
 static void sugov_iowait_boost(struct sugov_cpu *sg_cpu, unsigned long *util,
                               unsigned long *max)
 {
-       unsigned long boost_util, boost_max;
+       unsigned int boost_util, boost_max;
 
        if (!sg_cpu->iowait_boost)
                return;