Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8636fd28 authored by Andreas Schwab's avatar Andreas Schwab Committed by Rafael J. Wysocki
Browse files

cpufreq: fix jiffies/cputime mixup in conservative/ondemand governors 



The function get_cpu_idle_time_jiffy in both the conservative and
ondemand governors use jiffies_to_usecs to convert a cputime value to
usecs which gives the wrong value on architectures where cputime and
jiffies use different units.  Only matters if NO_HZ is disabled, since
otherwise get_cpu_idle_time_us should already return a valid value, and
get_cpu_idle_time_jiffy isn't actually called.

Signed-off-by: default avatarAndreas Schwab <schwab@linux-m68k.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent db701151

drivers/cpufreq/cpufreq_governor.c

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall) 


	idle_time = cur_wall_time - busy_time;

	if (wall)

		*wall = jiffies_to_usecs(cur_wall_time);

		*wall = cputime_to_usecs(cur_wall_time);



	return jiffies_to_usecs(idle_time);

	return cputime_to_usecs(idle_time);

}



cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall)