diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-12-19 22:23:15 +0400 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-12-19 22:23:15 +0400 |
| commit | 612ef28a045efadb3a98d4492ead7806a146485d (patch) | |
| tree | 05621c87b37e91c27b06d450d76adffe97ce9666 /fs/proc/uptime.c | |
| parent | c3e0ef9a298e028a82ada28101ccd5cf64d209ee (diff) | |
| parent | 07cde2608a3b5c66515363f1b53623b1536b9785 (diff) | |
| download | linux-612ef28a045efadb3a98d4492ead7806a146485d.tar.xz | |
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip
Conflicts:
drivers/cpufreq/cpufreq_conservative.c
drivers/cpufreq/cpufreq_ondemand.c
drivers/macintosh/rack-meter.c
fs/proc/stat.c
fs/proc/uptime.c
kernel/sched/core.c
Diffstat (limited to 'fs/proc/uptime.c')
| -rw-r--r-- | fs/proc/uptime.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/uptime.c b/fs/proc/uptime.c index ab515109fec9..9610ac772d7e 100644 --- a/fs/proc/uptime.c +++ b/fs/proc/uptime.c @@ -11,14 +11,14 @@ static int uptime_proc_show(struct seq_file *m, void *v) { struct timespec uptime; struct timespec idle; - cputime64_t idletime; + u64 idletime; u64 nsec; u32 rem; int i; idletime = 0; for_each_possible_cpu(i) - idletime += kstat_cpu(i).cpustat.idle; + idletime += (__force u64) kcpustat_cpu(i).cpustat[CPUTIME_IDLE]; do_posix_clock_monotonic_gettime(&uptime); monotonic_to_bootbased(&uptime); |