2 files changed, 22 insertions, 7 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 247084be0590..ffbf5d788bf3 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -527,13 +527,29 @@ config RCU_USER_QS
 config CONTEXT_TRACKING_FORCE
         bool "Force context tracking"
         depends on CONTEXT_TRACKING
-        default CONTEXT_TRACKING
+        default y if !NO_HZ_FULL
         help
-          Probe on user/kernel boundaries by default in order to
-          test the features that rely on it such as userspace RCU extended
-          quiescent states.
-          This test is there for debugging until we have a real user like the
-          full dynticks mode.
+          The major pre-requirement for full dynticks to work is to
+          support the context tracking subsystem. But there are also
+          other dependencies to provide in order to make the full
+          dynticks working.
+
+          This option stands for testing when an arch implements the
+          context tracking backend but doesn't yet fullfill all the
+          requirements to make the full dynticks feature working.
+          Without the full dynticks, there is no way to test the support
+          for context tracking and the subsystems that rely on it: RCU
+          userspace extended quiescent state and tickless cputime
+          accounting. This option copes with the absence of the full
+          dynticks subsystem by forcing the context tracking on all
+          CPUs in the system.
+
+          Say Y only if you're working on the developpement of an
+          architecture backend for the context tracking.
+
+          Say N otherwise, this option brings an overhead that you
+          don't want in production.
+
 
 config RCU_FANOUT
         int "Tree-based hierarchical RCU fanout value"
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index 70f27e89012b..747bbc70f53b 100644
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -105,7 +105,6 @@ config NO_HZ_FULL
         select RCU_USER_QS
         select RCU_NOCB_CPU
         select VIRT_CPU_ACCOUNTING_GEN
-        select CONTEXT_TRACKING_FORCE
         select IRQ_WORK
         help
          Adaptively try to shutdown the tick whenever possible, even when