2 files changed, 25 insertions, 2 deletions

diff --git a/init/Kconfig b/init/Kconfig
index dcb68ac42b78..7000d9657402 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -322,10 +322,13 @@ source "kernel/time/Kconfig"
 
 menu "CPU/Task time and stats accounting"
 
+config VIRT_CPU_ACCOUNTING
+        bool
+
 choice
         prompt "Cputime accounting"
         default TICK_CPU_ACCOUNTING if !PPC64
-        default VIRT_CPU_ACCOUNTING if PPC64
+        default VIRT_CPU_ACCOUNTING_NATIVE if PPC64
 
 # Kind of a stub config for the pure tick based cputime accounting
 config TICK_CPU_ACCOUNTING
@@ -338,9 +341,10 @@ config TICK_CPU_ACCOUNTING
 
           If unsure, say Y.
 
-config VIRT_CPU_ACCOUNTING
+config VIRT_CPU_ACCOUNTING_NATIVE
         bool "Deterministic task and CPU time accounting"
         depends on HAVE_VIRT_CPU_ACCOUNTING
+        select VIRT_CPU_ACCOUNTING
         help
           Select this option to enable more accurate task and CPU time
           accounting.  This is done by reading a CPU counter on each
@@ -350,6 +354,23 @@ config VIRT_CPU_ACCOUNTING
           this also enables accounting of stolen time on logically-partitioned
           systems.
 
+config VIRT_CPU_ACCOUNTING_GEN
+        bool "Full dynticks CPU time accounting"
+        depends on HAVE_CONTEXT_TRACKING && 64BIT
+        select VIRT_CPU_ACCOUNTING
+        select CONTEXT_TRACKING
+        help
+          Select this option to enable task and CPU time accounting on full
+          dynticks systems. This accounting is implemented by watching every
+          kernel-user boundaries using the context tracking subsystem.
+          The accounting is thus performed at the expense of some significant
+          overhead.
+
+          For now this is only useful if you are working on the full
+          dynticks subsystem development.
+
+          If unsure, say N.
+
 config IRQ_TIME_ACCOUNTING
         bool "Fine granularity task level IRQ time accounting"
         depends on HAVE_IRQ_TIME_ACCOUNTING
diff --git a/init/init_task.c b/init/init_task.c
index 8b2f3996b035..ba0a7f362d9e 100644
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -2,6 +2,8 @@
 #include <linux/export.h>
 #include <linux/mqueue.h>
 #include <linux/sched.h>
+#include <linux/sched/sysctl.h>
+#include <linux/sched/rt.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/mm.h>