summaryrefslogtreecommitdiffstats
path: root/fs/proc/stat.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-12-15 08:21:21 +0100
committerIngo Molnar <mingo@elte.hu>2011-12-15 08:21:30 +0100
commit6a54aebf6978e9f296a4d3da3e40af425163c22e (patch)
tree8217c7114db02d8b69c22fc44880749426949bc3 /fs/proc/stat.c
parentsched, nohz: Fix missing RCU read lock (diff)
parentLinux 3.2-rc5 (diff)
downloadlinux-6a54aebf6978e9f296a4d3da3e40af425163c22e.tar.xz
linux-6a54aebf6978e9f296a4d3da3e40af425163c22e.zip
Merge commit 'v3.2-rc5' into sched/core
Merge reason: Pick up the latest fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/proc/stat.c')
-rw-r--r--fs/proc/stat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/stat.c b/fs/proc/stat.c
index 8a6ab666e9f8..2527a68057fc 100644
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -31,7 +31,7 @@ static u64 get_idle_time(int cpu)
idle = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE];
idle += arch_idle_time(cpu);
} else
- idle = usecs_to_cputime(idle_time);
+ idle = nsecs_to_jiffies64(1000 * idle_time);
return idle;
}
@@ -44,7 +44,7 @@ static u64 get_iowait_time(int cpu)
/* !NO_HZ so we can rely on cpustat.iowait */
iowait = kcpustat_cpu(cpu).cpustat[CPUTIME_IOWAIT];
else
- iowait = usecs_to_cputime(iowait_time);
+ iowait = nsecs_to_jiffies64(1000 * iowait_time);
return iowait;
}