Merge branch 'from-linus' into upstream

2 files changed, 28 insertions, 0 deletions

diff --git a/init/Kconfig b/init/Kconfig
index a5b073a103e7..a099fc6526d9 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -158,6 +158,30 @@ config BSD_PROCESS_ACCT_V3
           for processing it. A preliminary version of these tools is available
           at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>.
 
+config TASKSTATS
+        bool "Export task/process statistics through netlink (EXPERIMENTAL)"
+        depends on NET
+        default n
+        help
+          Export selected statistics for tasks/processes through the
+          generic netlink interface. Unlike BSD process accounting, the
+          statistics are available during the lifetime of tasks/processes as
+          responses to commands. Like BSD accounting, they are sent to user
+          space on task exit.
+
+          Say N if unsure.
+
+config TASK_DELAY_ACCT
+        bool "Enable per-task delay accounting (EXPERIMENTAL)"
+        depends on TASKSTATS
+        help
+          Collect information on time spent by a task waiting for system
+          resources like cpu, synchronous block I/O completion and swapping
+          in pages. Such statistics can help in setting a task's priorities
+          relative to other tasks for cpu, io, rss limits etc.
+
+          Say N if unsure.
+
 config SYSCTL
         bool "Sysctl support" if EMBEDDED
         default y
diff --git a/init/main.c b/init/main.c
index 628b8e9e841a..8651a720a092 100644
--- a/init/main.c
+++ b/init/main.c
@@ -41,6 +41,8 @@
 #include <linux/cpu.h>
 #include <linux/cpuset.h>
 #include <linux/efi.h>
+#include <linux/taskstats_kern.h>
+#include <linux/delayacct.h>
 #include <linux/unistd.h>
 #include <linux/rmap.h>
 #include <linux/mempolicy.h>
@@ -574,6 +576,8 @@ asmlinkage void __init start_kernel(void)
         proc_root_init();
 #endif
         cpuset_init();
+        taskstats_init_early();
+        delayacct_init();
 
         check_bugs();