Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e561f97 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-fixes-for-linus' of... 

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
parents 9f96ae6e 35626129

include/linux/sched.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -443,6 +443,7 @@ struct pacct_struct { 
 * @utime:		time spent in user mode, in &cputime_t units

 * @utime:		time spent in user mode, in &cputime_t units

 * @stime:		time spent in kernel 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

 * @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

 * This structure groups together three kinds of CPU time that are

 * tracked for threads and thread groups.  Most things considering

 * tracked for threads and thread groups.  Most things considering