diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
| commit | 95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c (patch) | |
| tree | aa2aac22a5b329b778a6771a87bbf1945ad49bbd /include/linux/taskstats.h | |
| parent | d278c48435625cb6b7edcf6a547620768b175709 (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into perfcounters/core
Conflicts:
arch/x86/kernel/setup_percpu.c
arch/x86/mm/fault.c
drivers/acpi/processor_idle.c
kernel/irq/handle.c
Diffstat (limited to 'include/linux/taskstats.h')
| -rw-r--r-- | include/linux/taskstats.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/taskstats.h b/include/linux/taskstats.h index 18269e956a71..341dddb55090 100644 --- a/include/linux/taskstats.h +++ b/include/linux/taskstats.h | |||
| @@ -16,6 +16,8 @@ | |||
| 16 | #ifndef _LINUX_TASKSTATS_H | 16 | #ifndef _LINUX_TASKSTATS_H |
| 17 | #define _LINUX_TASKSTATS_H | 17 | #define _LINUX_TASKSTATS_H |
| 18 | 18 | ||
| 19 | #include <linux/types.h> | ||
| 20 | |||
| 19 | /* Format for per-task data returned to userland when | 21 | /* Format for per-task data returned to userland when |
| 20 | * - a task exits | 22 | * - a task exits |
| 21 | * - listener requests stats for a task | 23 | * - listener requests stats for a task |