public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] cputime patch for 2.6.30-rc6
@ 2009-05-18 14:09 Martin Schwidefsky
  2009-05-18 15:24 ` Peter Zijlstra
  0 siblings, 1 reply; 16+ messages in thread
From: Martin Schwidefsky @ 2009-05-18 14:09 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel, Michael Abbott, Jan Engelhardt

Hi Linus,

please pull from 'cputime' branch of

	git://git390.marist.edu/pub/scm/linux-2.6.git cputime

to receive the following updates:

Michael Abbott (1):
      Fix idle time field in /proc/uptime

 fs/proc/uptime.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/fs/proc/uptime.c b/fs/proc/uptime.c
index 0c10a0b..c0ac0d7 100644
--- a/fs/proc/uptime.c
+++ b/fs/proc/uptime.c
@@ -4,13 +4,19 @@
 #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 len, i;
+	cputime_t idletime = 0;
+
+	for_each_possible_cpu(i)
+		idletime = cputime64_add(idletime, kstat_cpu(i).cpustat.idle);
+	idletime = cputime64_to_clock_t(idletime);
 
 	do_posix_clock_monotonic_gettime(&uptime);
 	monotonic_to_bootbased(&uptime);

^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2009-05-25 11:36 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-18 14:09 [GIT PULL] cputime patch for 2.6.30-rc6 Martin Schwidefsky
2009-05-18 15:24 ` Peter Zijlstra
2009-05-18 16:28   ` Michael Abbott
2009-05-19  9:00     ` Martin Schwidefsky
2009-05-19  9:31       ` Peter Zijlstra
2009-05-20  8:09         ` Martin Schwidefsky
2009-05-20  8:19           ` Peter Zijlstra
2009-05-20  8:44           ` Michael Abbott
2009-05-25 11:06             ` Martin Schwidefsky
2009-05-19  8:49   ` Martin Schwidefsky
2009-05-19  9:00     ` Peter Zijlstra
2009-05-25 10:50       ` Martin Schwidefsky
2009-05-25 11:09         ` Peter Zijlstra
2009-05-25 11:24           ` Jan Engelhardt
2009-05-25 11:35           ` Martin Schwidefsky
2009-05-19 13:32   ` Jan Engelhardt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox