2 files changed, 5 insertions, 1 deletions

diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index d62c04482228..6b82a9565149 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -206,6 +206,9 @@ 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
+        .ignore_user_qs = true,
+#endif
 };
 
 static int blimit = 10;         /* Maximum callbacks per rcu_do_batch. */
@@ -430,7 +433,7 @@ void rcu_user_enter(void)
 
         local_irq_save(flags);
         rdtp = &__get_cpu_var(rcu_dynticks);
-        if (!rdtp->in_user) {
+        if (!rdtp->ignore_user_qs && !rdtp->in_user) {
                 rdtp->in_user = true;
                 rcu_eqs_enter(1);
         }
diff --git a/kernel/rcutree.h b/kernel/rcutree.h
index 10cc2f9f8433..5faf05d68326 100644
--- a/kernel/rcutree.h
+++ b/kernel/rcutree.h
@@ -103,6 +103,7 @@ struct rcu_dynticks {
         int tick_nohz_enabled_snap; /* Previously seen value from sysfs. */
 #endif /* #ifdef CONFIG_RCU_FAST_NO_HZ */
 #ifdef CONFIG_RCU_USER_QS
+        bool ignore_user_qs;        /* Treat userspace as extended QS or not */
         bool in_user;               /* Is the CPU in userland from RCU POV? */
 #endif
 };