From 0a016eaf4fb9fdff1b30710d2d40667bc2a114d5 Mon Sep 17 00:00:00 2001 From: Santosh Mardi Date: Thu, 20 Feb 2020 16:37:32 +0530 Subject: [PATCH] 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 --- kernel/sched/sched.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 714e874b975e..9b7fe83074b9 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2169,7 +2169,7 @@ cpu_util_freq_walt(int cpu, struct sched_walt_cpu_load *walt_load); #define sched_ravg_window TICK_NSEC static inline u64 sched_ktime_clock(void) { - return 0; + return sched_clock(); } #endif @@ -2646,16 +2646,20 @@ DECLARE_PER_CPU(struct update_util_data __rcu *, cpufreq_update_util_data); 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); } #else static inline void cpufreq_update_util(struct rq *rq, unsigned int flags) {}