summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-04 13:58:37 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-04 13:58:37 -0800
commit3e561f975cd6db846b2bbd684cd107a27f5d8aaa (patch)
treec7b5b2d0a744cbe096c6f2572ce7803ccd399deb /include/linux
parent9f96ae6ee049b78dc334965a38fb441f7a16201f (diff)
parent35626129abcd6a7547e84c817ef5b6eff7a8758b (diff)
downloadblackbird-op-linux-3e561f975cd6db846b2bbd684cd107a27f5d8aaa.tar.gz
blackbird-op-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/linux')
-rw-r--r--include/linux/sched.h1
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
OpenPOWER on IntegriCloud