diff options
Diffstat (limited to 'kernel/sys.c')
-rw-r--r-- | kernel/sys.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index e6e0ece5f6a0..265b37690421 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -1046,7 +1046,7 @@ void do_sys_times(struct tms *tms) | |||
1046 | cputime_t tgutime, tgstime, cutime, cstime; | 1046 | cputime_t tgutime, tgstime, cutime, cstime; |
1047 | 1047 | ||
1048 | spin_lock_irq(¤t->sighand->siglock); | 1048 | spin_lock_irq(¤t->sighand->siglock); |
1049 | thread_group_times(current, &tgutime, &tgstime); | 1049 | thread_group_cputime_adjusted(current, &tgutime, &tgstime); |
1050 | cutime = current->signal->cutime; | 1050 | cutime = current->signal->cutime; |
1051 | cstime = current->signal->cstime; | 1051 | cstime = current->signal->cstime; |
1052 | spin_unlock_irq(¤t->sighand->siglock); | 1052 | spin_unlock_irq(¤t->sighand->siglock); |
@@ -1704,7 +1704,7 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r) | |||
1704 | utime = stime = 0; | 1704 | utime = stime = 0; |
1705 | 1705 | ||
1706 | if (who == RUSAGE_THREAD) { | 1706 | if (who == RUSAGE_THREAD) { |
1707 | task_times(current, &utime, &stime); | 1707 | task_cputime_adjusted(current, &utime, &stime); |
1708 | accumulate_thread_rusage(p, r); | 1708 | accumulate_thread_rusage(p, r); |
1709 | maxrss = p->signal->maxrss; | 1709 | maxrss = p->signal->maxrss; |
1710 | goto out; | 1710 | goto out; |
@@ -1730,7 +1730,7 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r) | |||
1730 | break; | 1730 | break; |
1731 | 1731 | ||
1732 | case RUSAGE_SELF: | 1732 | case RUSAGE_SELF: |
1733 | thread_group_times(p, &tgutime, &tgstime); | 1733 | thread_group_cputime_adjusted(p, &tgutime, &tgstime); |
1734 | utime += tgutime; | 1734 | utime += tgutime; |
1735 | stime += tgstime; | 1735 | stime += tgstime; |
1736 | r->ru_nvcsw += p->signal->nvcsw; | 1736 | r->ru_nvcsw += p->signal->nvcsw; |