diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-05 13:03:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 13:03:35 +0100 |
| commit | 83895147b702434e6f236deeca75211fd0e3da3a (patch) | |
| tree | 550a8a8828592d9aa110d1851cc52e0f2c95bac7 /include/linux | |
| parent | a6a95406c676ffe4f9dee708eb404a17c69f7fdd (diff) | |
| parent | 483b4ee60edbefdfbff0dd538fb81f368d9e7c0d (diff) | |
Merge branch 'sched/urgent' into timers/urgent
Merging it here because an upcoming timers/urgent fix relies on
a change already in sched/urgent and not yet upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux')
| -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 5a7c7638873..2127e959e0f 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 |