diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 16:58:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 16:58:37 -0500 |
| commit | 3e561f975cd6db846b2bbd684cd107a27f5d8aaa (patch) | |
| tree | c7b5b2d0a744cbe096c6f2572ce7803ccd399deb | |
| parent | 9f96ae6ee049b78dc334965a38fb441f7a16201f (diff) | |
| parent | 35626129abcd6a7547e84c817ef5b6eff7a8758b (diff) | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: add missing kernel-doc in 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 5a7c76388731..2127e959e0f4 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -443,6 +443,7 @@ struct pacct_struct { | |||
| 443 | * @utime: time spent in user mode, in &cputime_t units | 443 | * @utime: time spent in user mode, in &cputime_t units |
| 444 | * @stime: time spent in kernel mode, in &cputime_t units | 444 | * @stime: time spent in kernel mode, in &cputime_t units |
| 445 | * @sum_exec_runtime: total time spent on the CPU, in nanoseconds | 445 | * @sum_exec_runtime: total time spent on the CPU, in nanoseconds |
| 446 | * @lock: lock for fields in this struct | ||
| 446 | * | 447 | * |
| 447 | * This structure groups together three kinds of CPU time that are | 448 | * This structure groups together three kinds of CPU time that are |
| 448 | * tracked for threads and thread groups. Most things considering | 449 | * tracked for threads and thread groups. Most things considering |