git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[safe/jmp/linux-2.6]
/
drivers
/
cpufreq
/
cpufreq_ondemand.c
diff --git
a/drivers/cpufreq/cpufreq_ondemand.c
b/drivers/cpufreq/cpufreq_ondemand.c
index
071699d
..
4b34ade
100644
(file)
--- a/
drivers/cpufreq/cpufreq_ondemand.c
+++ b/
drivers/cpufreq/cpufreq_ondemand.c
@@
-133,9
+133,9
@@
static inline cputime64_t get_cpu_idle_time_jiffy(unsigned int cpu,
idle_time = cputime64_sub(cur_wall_time, busy_time);
if (wall)
idle_time = cputime64_sub(cur_wall_time, busy_time);
if (wall)
- *wall =
cur_wall_time
;
+ *wall =
(cputime64_t)jiffies_to_usecs(cur_wall_time)
;
- return
idle_time
;
+ return
(cputime64_t)jiffies_to_usecs(idle_time)
;
}
static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall)
}
static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall)