diff options
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r-- | fs/proc/array.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 51a4213afa2e..fe12b519d09b 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c | |||
@@ -401,8 +401,8 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, | |||
401 | unsigned long long start_time; | 401 | unsigned long long start_time; |
402 | unsigned long cmin_flt = 0, cmaj_flt = 0; | 402 | unsigned long cmin_flt = 0, cmaj_flt = 0; |
403 | unsigned long min_flt = 0, maj_flt = 0; | 403 | unsigned long min_flt = 0, maj_flt = 0; |
404 | cputime_t cutime, cstime, utime, stime; | 404 | u64 cutime, cstime, utime, stime; |
405 | cputime_t cgtime, gtime; | 405 | u64 cgtime, gtime; |
406 | unsigned long rsslim = 0; | 406 | unsigned long rsslim = 0; |
407 | char tcomm[sizeof(task->comm)]; | 407 | char tcomm[sizeof(task->comm)]; |
408 | unsigned long flags; | 408 | unsigned long flags; |
@@ -497,10 +497,10 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, | |||
497 | seq_put_decimal_ull(m, " ", cmin_flt); | 497 | seq_put_decimal_ull(m, " ", cmin_flt); |
498 | seq_put_decimal_ull(m, " ", maj_flt); | 498 | seq_put_decimal_ull(m, " ", maj_flt); |
499 | seq_put_decimal_ull(m, " ", cmaj_flt); | 499 | seq_put_decimal_ull(m, " ", cmaj_flt); |
500 | seq_put_decimal_ull(m, " ", cputime_to_clock_t(utime)); | 500 | seq_put_decimal_ull(m, " ", nsec_to_clock_t(utime)); |
501 | seq_put_decimal_ull(m, " ", cputime_to_clock_t(stime)); | 501 | seq_put_decimal_ull(m, " ", nsec_to_clock_t(stime)); |
502 | seq_put_decimal_ll(m, " ", cputime_to_clock_t(cutime)); | 502 | seq_put_decimal_ll(m, " ", nsec_to_clock_t(cutime)); |
503 | seq_put_decimal_ll(m, " ", cputime_to_clock_t(cstime)); | 503 | seq_put_decimal_ll(m, " ", nsec_to_clock_t(cstime)); |
504 | seq_put_decimal_ll(m, " ", priority); | 504 | seq_put_decimal_ll(m, " ", priority); |
505 | seq_put_decimal_ll(m, " ", nice); | 505 | seq_put_decimal_ll(m, " ", nice); |
506 | seq_put_decimal_ll(m, " ", num_threads); | 506 | seq_put_decimal_ll(m, " ", num_threads); |
@@ -542,8 +542,8 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, | |||
542 | seq_put_decimal_ull(m, " ", task->rt_priority); | 542 | seq_put_decimal_ull(m, " ", task->rt_priority); |
543 | seq_put_decimal_ull(m, " ", task->policy); | 543 | seq_put_decimal_ull(m, " ", task->policy); |
544 | seq_put_decimal_ull(m, " ", delayacct_blkio_ticks(task)); | 544 | seq_put_decimal_ull(m, " ", delayacct_blkio_ticks(task)); |
545 | seq_put_decimal_ull(m, " ", cputime_to_clock_t(gtime)); | 545 | seq_put_decimal_ull(m, " ", nsec_to_clock_t(gtime)); |
546 | seq_put_decimal_ll(m, " ", cputime_to_clock_t(cgtime)); | 546 | seq_put_decimal_ll(m, " ", nsec_to_clock_t(cgtime)); |
547 | 547 | ||
548 | if (mm && permitted) { | 548 | if (mm && permitted) { |
549 | seq_put_decimal_ull(m, " ", mm->start_data); | 549 | seq_put_decimal_ull(m, " ", mm->start_data); |