From: Rafael J. Wysocki Date: Sat, 24 Nov 2012 09:08:47 +0000 (+0100) Subject: cpufreq: governors: Fix jiffies/cputime mixup (revisited) X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~88^2~12^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0e5af3cb89b59aa6c62b1f97c8d553ff3fb51c1;p=pandora-kernel.git cpufreq: governors: Fix jiffies/cputime mixup (revisited) This change was made by commit 8636fd2 (cpufreq: fix jiffies/cputime mixup in conservative/ondemand governors) before, but then it has been reverted inadvertently by commit 4471a34 (cpufreq: governors: remove redundant code). The changelog of commit 8636fd2's says: 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. Since now we have only one common get_cpu_idle_time_jiffy() used by both governors in question, modify it along the lines of commit 8636fd2 to restore the correct behavior. Signed-off-by: Rafael J. Wysocki Reviewed-by: Viresh Kumar --- Reading git-diff-tree failed