diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 22:58:37 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 22:58:37 +0100 |
commit | 3e561f975cd6db846b2bbd684cd107a27f5d8aaa (patch) | |
tree | c7b5b2d0a744cbe096c6f2572ce7803ccd399deb /include | |
parent | Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
parent | sched: add missing kernel-doc in sched.h (diff) | |
download | linux-3e561f975cd6db846b2bbd684cd107a27f5d8aaa.tar.xz linux-3e561f975cd6db846b2bbd684cd107a27f5d8aaa.zip |
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
Diffstat (limited to 'include')
-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 { * @utime: time spent in user mode, in &cputime_t units * @stime: time spent in kernel mode, in &cputime_t units * @sum_exec_runtime: total time spent on the CPU, in nanoseconds + * @lock: lock for fields in this struct * * This structure groups together three kinds of CPU time that are * tracked for threads and thread groups. Most things considering |