From 018a6c84237751c77b1441ef5b5f130faa40f69f Mon Sep 17 00:00:00 2001 From: Michal Hocko Date: Thu, 8 Dec 2011 14:34:32 -0800 Subject: [PATCH] --- yaml --- r: 276545 b: refs/heads/master c: 2a95ea6c0d129b4568fb64e1deda16ceb20e6636 h: refs/heads/master i: 276543: c946ee4ab03e6bf3c7b92435aaf65ef29f561e4a v: v3 --- [refs] | 2 +- trunk/fs/proc/stat.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 371f97a8caad..fe672b690759 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1368edf0647ac112d8cfa6ce47257dc950c50f5c +refs/heads/master: 2a95ea6c0d129b4568fb64e1deda16ceb20e6636 diff --git a/trunk/fs/proc/stat.c b/trunk/fs/proc/stat.c index 42b274da92c3..2a30d67dd6b8 100644 --- a/trunk/fs/proc/stat.c +++ b/trunk/fs/proc/stat.c @@ -32,7 +32,7 @@ static cputime64_t get_idle_time(int cpu) idle = kstat_cpu(cpu).cpustat.idle; idle = cputime64_add(idle, arch_idle_time(cpu)); } else - idle = usecs_to_cputime(idle_time); + idle = nsecs_to_jiffies64(1000 * idle_time); return idle; } @@ -46,7 +46,7 @@ static cputime64_t get_iowait_time(int cpu) /* !NO_HZ so we can rely on cpustat.iowait */ iowait = kstat_cpu(cpu).cpustat.iowait; else - iowait = usecs_to_cputime(iowait_time); + iowait = nsecs_to_jiffies64(1000 * iowait_time); return iowait; }