1 files changed, 24 insertions, 20 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 4d55e81deff0..18bd9e3d3274 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -470,6 +470,7 @@ config TREE_RCU
 config TREE_PREEMPT_RCU
         bool "Preemptible tree-based hierarchical RCU"
         depends on PREEMPT
+        select IRQ_WORK
         help
           This option selects the RCU implementation that is
           designed for very large SMP systems with hundreds or
@@ -527,13 +528,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"
@@ -955,7 +972,7 @@ config MEMCG_SWAP_ENABLED
           Memory Resource Controller Swap Extension comes with its price in
           a bigger memory consumption. General purpose distribution kernels
           which want to enable the feature but keep it disabled by default
-          and let the user enable it by swapaccount boot command line
+          and let the user enable it by swapaccount=1 boot command line
           parameter should have this option unselected.
           For those who want to have the feature enabled by default should
           select this option (if, for some reason, they need to disable it
@@ -1106,7 +1123,6 @@ config IPC_NS
 
 config USER_NS
         bool "User namespace"
-        depends on UIDGID_CONVERTED
         select UIDGID_STRICT_TYPE_CHECKS
 
         default n
@@ -1140,20 +1156,8 @@ config NET_NS
 
 endif # NAMESPACES
 
-config UIDGID_CONVERTED
-        # True if all of the selected software conmponents are known
-        # to have uid_t and gid_t converted to kuid_t and kgid_t
-        # where appropriate and are otherwise safe to use with
-        # the user namespace.
-        bool
-        default y
-
-        # Filesystems
-        depends on XFS_FS = n
-
 config UIDGID_STRICT_TYPE_CHECKS
         bool "Require conversions between uid/gids and their internal representation"
-        depends on UIDGID_CONVERTED
         default n
         help
          While the nececessary conversions are being added to all subsystems this option allows