diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
| commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
| tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /Documentation/accounting/taskstats-struct.txt | |
| parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/accounting/taskstats-struct.txt')
| -rw-r--r-- | Documentation/accounting/taskstats-struct.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/accounting/taskstats-struct.txt b/Documentation/accounting/taskstats-struct.txt index b988d110db59..e7512c061c15 100644 --- a/Documentation/accounting/taskstats-struct.txt +++ b/Documentation/accounting/taskstats-struct.txt | |||
| @@ -6,7 +6,7 @@ This document contains an explanation of the struct taskstats fields. | |||
| 6 | There are three different groups of fields in the struct taskstats: | 6 | There are three different groups of fields in the struct taskstats: |
| 7 | 7 | ||
| 8 | 1) Common and basic accounting fields | 8 | 1) Common and basic accounting fields |
| 9 | If CONFIG_TASKSTATS is set, the taskstats inteface is enabled and | 9 | If CONFIG_TASKSTATS is set, the taskstats interface is enabled and |
| 10 | the common fields and basic accounting fields are collected for | 10 | the common fields and basic accounting fields are collected for |
| 11 | delivery at do_exit() of a task. | 11 | delivery at do_exit() of a task. |
| 12 | 2) Delay accounting fields | 12 | 2) Delay accounting fields |