Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'cputime' of git://git390.marist.edu/pub/scm/linux-2.6
* 'cputime' of git://git390.marist.edu/pub/scm/linux-2.6:
[PATCH] Fix idle time field in /proc/uptime
+6
-1
fs/proc/uptime.c
+6
-1
fs/proc/uptime.c
···
4
4
#include <linux/sched.h>
5
5
#include <linux/seq_file.h>
6
6
#include <linux/time.h>
7
+
#include <linux/kernel_stat.h>
7
8
#include <asm/cputime.h>
8
9
9
10
static int uptime_proc_show(struct seq_file *m, void *v)
10
11
{
11
12
struct timespec uptime;
12
13
struct timespec idle;
13
-
cputime_t idletime = cputime_add(init_task.utime, init_task.stime);
14
+
int i;
15
+
cputime_t idletime = cputime_zero;
16
+
17
+
for_each_possible_cpu(i)
18
+
idletime = cputime64_add(idletime, kstat_cpu(i).cpustat.idle);
14
19
15
20
do_posix_clock_monotonic_gettime(&uptime);
16
21
monotonic_to_bootbased(&uptime);