diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-12-08 15:31:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-12-08 15:31:07 +0100 |
| commit | e783377e93d4043a11013ce6e9173db34998e653 (patch) | |
| tree | 47a56d363512337d78aa1cef0b620cbc7b53092f /fs/proc/array.c | |
| parent | 222e82bef4bd520a31d48c31ab24e49dd46daa46 (diff) | |
| parent | fa09205783d11cc05122ad6e4ce06074624b2c0c (diff) | |
Merge tag 'cputime-adjustment-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into sched/core
Pull cputime cleanups from Frederic Weisbecker:
* Improve naming and code location
* Consolidate adjustment code
* Comment the adjustement code
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/proc/array.c')
| -rw-r--r-- | fs/proc/array.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index c1c207c36cae..d3696708fc1a 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -438,7 +438,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, min_flt += sig->min_flt; maj_flt += sig->maj_flt; - thread_group_times(task, &utime, &stime); + thread_group_cputime_adjusted(task, &utime, &stime); gtime += sig->gtime; } @@ -454,7 +454,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, if (!whole) { min_flt = task->min_flt; maj_flt = task->maj_flt; - task_times(task, &utime, &stime); + task_cputime_adjusted(task, &utime, &stime); gtime = task->gtime; } |