diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 13 | ||||
-rw-r--r-- | init/main.c | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 90498a3e53da..56a7093b4e4c 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -158,6 +158,19 @@ config BSD_PROCESS_ACCT_V3 | |||
158 | for processing it. A preliminary version of these tools is available | 158 | for processing it. A preliminary version of these tools is available |
159 | at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>. | 159 | at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>. |
160 | 160 | ||
161 | config TASKSTATS | ||
162 | bool "Export task/process statistics through netlink (EXPERIMENTAL)" | ||
163 | depends on NET | ||
164 | default n | ||
165 | help | ||
166 | Export selected statistics for tasks/processes through the | ||
167 | generic netlink interface. Unlike BSD process accounting, the | ||
168 | statistics are available during the lifetime of tasks/processes as | ||
169 | responses to commands. Like BSD accounting, they are sent to user | ||
170 | space on task exit. | ||
171 | |||
172 | Say N if unsure. | ||
173 | |||
161 | config TASK_DELAY_ACCT | 174 | config TASK_DELAY_ACCT |
162 | bool "Enable per-task delay accounting (EXPERIMENTAL)" | 175 | bool "Enable per-task delay accounting (EXPERIMENTAL)" |
163 | help | 176 | help |
diff --git a/init/main.c b/init/main.c index 9e8e8c152142..8651a720a092 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <linux/cpu.h> | 41 | #include <linux/cpu.h> |
42 | #include <linux/cpuset.h> | 42 | #include <linux/cpuset.h> |
43 | #include <linux/efi.h> | 43 | #include <linux/efi.h> |
44 | #include <linux/taskstats_kern.h> | ||
44 | #include <linux/delayacct.h> | 45 | #include <linux/delayacct.h> |
45 | #include <linux/unistd.h> | 46 | #include <linux/unistd.h> |
46 | #include <linux/rmap.h> | 47 | #include <linux/rmap.h> |
@@ -575,6 +576,7 @@ asmlinkage void __init start_kernel(void) | |||
575 | proc_root_init(); | 576 | proc_root_init(); |
576 | #endif | 577 | #endif |
577 | cpuset_init(); | 578 | cpuset_init(); |
579 | taskstats_init_early(); | ||
578 | delayacct_init(); | 580 | delayacct_init(); |
579 | 581 | ||
580 | check_bugs(); | 582 | check_bugs(); |