Merge "sched: use rq_clock if WALT is not enabled" (ad84b38b) · Commits · e / devices / android_kernel_fairphone_FP4

kernel/sched/sched.h

+6 −2

Original line number	Diff line number	Diff line
		@@ -2042,7 +2042,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

		@@ -2504,16 +2504,20 @@ DECLARE_PER_CPU(struct update_util_data *, 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) {}