diff options
Diffstat (limited to 'kernel/sys.c')
-rw-r--r-- | kernel/sys.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 842914ef7de4..7d4a9a6df956 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -881,15 +881,15 @@ SYSCALL_DEFINE0(getegid) | |||
881 | 881 | ||
882 | void do_sys_times(struct tms *tms) | 882 | void do_sys_times(struct tms *tms) |
883 | { | 883 | { |
884 | cputime_t tgutime, tgstime, cutime, cstime; | 884 | u64 tgutime, tgstime, cutime, cstime; |
885 | 885 | ||
886 | thread_group_cputime_adjusted(current, &tgutime, &tgstime); | 886 | thread_group_cputime_adjusted(current, &tgutime, &tgstime); |
887 | cutime = current->signal->cutime; | 887 | cutime = current->signal->cutime; |
888 | cstime = current->signal->cstime; | 888 | cstime = current->signal->cstime; |
889 | tms->tms_utime = cputime_to_clock_t(tgutime); | 889 | tms->tms_utime = nsec_to_clock_t(tgutime); |
890 | tms->tms_stime = cputime_to_clock_t(tgstime); | 890 | tms->tms_stime = nsec_to_clock_t(tgstime); |
891 | tms->tms_cutime = cputime_to_clock_t(cutime); | 891 | tms->tms_cutime = nsec_to_clock_t(cutime); |
892 | tms->tms_cstime = cputime_to_clock_t(cstime); | 892 | tms->tms_cstime = nsec_to_clock_t(cstime); |
893 | } | 893 | } |
894 | 894 | ||
895 | SYSCALL_DEFINE1(times, struct tms __user *, tbuf) | 895 | SYSCALL_DEFINE1(times, struct tms __user *, tbuf) |
@@ -1544,7 +1544,7 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r) | |||
1544 | { | 1544 | { |
1545 | struct task_struct *t; | 1545 | struct task_struct *t; |
1546 | unsigned long flags; | 1546 | unsigned long flags; |
1547 | cputime_t tgutime, tgstime, utime, stime; | 1547 | u64 tgutime, tgstime, utime, stime; |
1548 | unsigned long maxrss = 0; | 1548 | unsigned long maxrss = 0; |
1549 | 1549 | ||
1550 | memset((char *)r, 0, sizeof (*r)); | 1550 | memset((char *)r, 0, sizeof (*r)); |
@@ -1600,8 +1600,8 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r) | |||
1600 | unlock_task_sighand(p, &flags); | 1600 | unlock_task_sighand(p, &flags); |
1601 | 1601 | ||
1602 | out: | 1602 | out: |
1603 | cputime_to_timeval(utime, &r->ru_utime); | 1603 | r->ru_utime = ns_to_timeval(utime); |
1604 | cputime_to_timeval(stime, &r->ru_stime); | 1604 | r->ru_stime = ns_to_timeval(stime); |
1605 | 1605 | ||
1606 | if (who != RUSAGE_CHILDREN) { | 1606 | if (who != RUSAGE_CHILDREN) { |
1607 | struct mm_struct *mm = get_task_mm(p); | 1607 | struct mm_struct *mm = get_task_mm(p); |