From 785f578bf39db9a7ce446d3d6c5fef629770862e Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 24 Oct 2012 22:16:34 +0200 Subject: [PATCH] --- yaml --- r: 336706 b: refs/heads/master c: 8636fd280e970696be62c8495a5aacb5f3b6237d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/cpufreq_governor.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1c55d519e2aa..6ba7271fadb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db7011516cbfc3d867b77721f77258d36cfbf705 +refs/heads/master: 8636fd280e970696be62c8495a5aacb5f3b6237d diff --git a/trunk/drivers/cpufreq/cpufreq_governor.c b/trunk/drivers/cpufreq/cpufreq_governor.c index 0001071cdcdb..679842a8d34a 100644 --- a/trunk/drivers/cpufreq/cpufreq_governor.c +++ b/trunk/drivers/cpufreq/cpufreq_governor.c @@ -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)