diff options
Diffstat (limited to 'fs/proc/array.c')
| -rw-r--r-- | fs/proc/array.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 218e20e62701..e0b09b3ced45 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -71,6 +71,7 @@ #include <linux/signal.h> #include <linux/highmem.h> #include <linux/file.h> +#include <linux/times.h> #include <asm/uaccess.h> #include <asm/pgtable.h> @@ -360,15 +361,15 @@ int proc_pid_stat(struct task_struct *task, char * buffer) task->cmin_flt, task->maj_flt, task->cmaj_flt, - task->times.tms_utime, - task->times.tms_stime, - task->times.tms_cutime, - task->times.tms_cstime, + jiffies_to_clock_t(task->utime), + jiffies_to_clock_t(task->stime), + jiffies_to_clock_t(task->cutime), + jiffies_to_clock_t(task->cstime), priority, nice, 0UL /* removed */, - task->it_real_value, - task->start_time, + jiffies_to_clock_t(task->it_real_value), + jiffies_to_clock_t(task->start_time), vsize, mm ? mm->rss : 0, /* you might want to shift this left 3 */ task->rlim[RLIMIT_RSS].rlim_cur, @@ -692,15 +693,15 @@ int proc_pid_cpu(struct task_struct *task, char * buffer) len = sprintf(buffer, "cpu %lu %lu\n", - task->times.tms_utime, - task->times.tms_stime); + jiffies_to_clock_t(task->utime), + jiffies_to_clock_t(task->stime)); for (i = 0 ; i < NR_CPUS; i++) { if (cpu_online(i)) len += sprintf(buffer + len, "cpu%d %lu %lu\n", i, - task->per_cpu_utime[i], - task->per_cpu_stime[i]); + jiffies_to_clock_t(task->per_cpu_utime[i]), + jiffies_to_clock_t(task->per_cpu_stime[i])); } return len; |