2 files changed, 9 insertions, 1 deletions

diff --git a/init/Kconfig b/init/Kconfig
index f6a1830165ce..c26b8a1d2b57 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -451,6 +451,14 @@ config RCU_USER_QS
           excluded from the global RCU state machine and thus doesn't
           to keep the timer tick on for RCU.
 
+config RCU_USER_QS_FORCE
+        bool "Force userspace extended QS by default"
+        depends on RCU_USER_QS
+        help
+          Set the hooks in user/kernel boundaries by default in order to
+          test this feature that treats userspace as an extended quiescent
+          state until we have a real user like a full adaptive nohz option.
+
 config RCU_FANOUT
         int "Tree-based hierarchical RCU fanout value"
         range 2 64 if 64BIT
diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index d2e74c8d4b0e..812d04b6b395 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -206,7 +206,7 @@ EXPORT_SYMBOL_GPL(rcu_note_context_switch);
 DEFINE_PER_CPU(struct rcu_dynticks, rcu_dynticks) = {
         .dynticks_nesting = DYNTICK_TASK_EXIT_IDLE,
         .dynticks = ATOMIC_INIT(1),
-#ifdef CONFIG_RCU_USER_QS
+#if defined(CONFIG_RCU_USER_QS) && !defined(CONFIG_RCU_USER_QS_FORCE)
         .ignore_user_qs = true,
 #endif
 };