diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-14 14:12:06 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-14 14:12:06 +1000 |
commit | 4fb48b896dfdc1e7c4c47bee00f862a3a4e30dd2 (patch) | |
tree | 9d06e8118e053a756afaf2eced41f91202ea7118 | |
parent | 0b7f9cfae0eb71cefa6ed96b5fb863ac2c22a109 (diff) | |
parent | 27bf8712477db47c891e6198000c985631cd18de (diff) |
Merge commit 'cputime/cputime'
-rw-r--r-- | fs/proc/uptime.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/proc/uptime.c b/fs/proc/uptime.c index 0c10a0b3f146..766b1d456050 100644 --- a/fs/proc/uptime.c +++ b/fs/proc/uptime.c @@ -4,13 +4,18 @@ #include <linux/sched.h> #include <linux/seq_file.h> #include <linux/time.h> +#include <linux/kernel_stat.h> #include <asm/cputime.h> static int uptime_proc_show(struct seq_file *m, void *v) { struct timespec uptime; struct timespec idle; - cputime_t idletime = cputime_add(init_task.utime, init_task.stime); + int i; + cputime_t idletime = cputime_zero; + + for_each_possible_cpu(i) + idletime = cputime64_add(idletime, kstat_cpu(i).cpustat.idle); do_posix_clock_monotonic_gettime(&uptime); monotonic_to_bootbased(&uptime); |