diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 04:32:48 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 04:32:48 -0500 |
| commit | 4ad476e11f94fd3724c6e272d8220e99cd222b27 (patch) | |
| tree | a8684d4ecbfe1d2b2b1e29ed74de65394ad21b43 /include/linux/sched.h | |
| parent | 304cc6ae1bf7a8e6d00053fbe0b7e2b26cdddda2 (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into tracing/core
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index f3c23cf11abc..699edb8e1853 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -445,6 +445,7 @@ struct pacct_struct { | |||
| 445 | * @utime: time spent in user mode, in &cputime_t units | 445 | * @utime: time spent in user mode, in &cputime_t units |
| 446 | * @stime: time spent in kernel mode, in &cputime_t units | 446 | * @stime: time spent in kernel mode, in &cputime_t units |
| 447 | * @sum_exec_runtime: total time spent on the CPU, in nanoseconds | 447 | * @sum_exec_runtime: total time spent on the CPU, in nanoseconds |
| 448 | * @lock: lock for fields in this struct | ||
| 448 | * | 449 | * |
| 449 | * This structure groups together three kinds of CPU time that are | 450 | * This structure groups together three kinds of CPU time that are |
| 450 | * tracked for threads and thread groups. Most things considering | 451 | * tracked for threads and thread groups. Most things considering |