sched: use rq_clock if WALT is not enabled
Use rq_clock to send timestamp to util update handler
if WALT is not enabled in the system.
Change-Id: I1e367c506a2fc286a4dfbac9d1f6cdd897d31f2d
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index e2f1d27..0ed63b8 100755
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -2338,7 +2338,7 @@
#else /* CONFIG_SCHED_WALT */
static inline u64 sched_ktime_clock(void)
{
- return 0;
+ return sched_clock();
}
static inline void note_task_waking(struct task_struct *p, u64 wallclock) { }
#endif /* CONFIG_SCHED_WALT */
@@ -2371,16 +2371,20 @@
static inline void cpufreq_update_util(struct rq *rq, unsigned int flags)
{
struct update_util_data *data;
+ u64 clock;
#ifdef CONFIG_SCHED_WALT
if (!(flags & SCHED_CPUFREQ_WALT))
return;
+ clock = sched_ktime_clock();
+#else
+ clock = rq_clock(rq);
#endif
data = rcu_dereference_sched(*per_cpu_ptr(&cpufreq_update_util_data,
cpu_of(rq)));
if (data)
- data->func(data, sched_ktime_clock(), flags);
+ data->func(data, clock, flags);
}
static inline void cpufreq_update_this_cpu(struct rq *rq, unsigned int flags)