Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu

Pull RCU changes from Paul E. McKenney:

  - The combination of tree geometry-initialization simplifications
    and OS-jitter-reduction changes to expedited grace periods.
    These two are stacked due to the large number of conflicts
    that would otherwise result.

    [ With one addition, a temporary commit to silence a lockdep false
      positive. Additional changes to the expedited grace-period
      primitives (queued for 4.4) remove the cause of this false
      positive, and therefore include a revert of this temporary commit. ]

  - Documentation updates.

  - Torture-test updates.

  - Miscellaneous fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 9 deletions

diff --git a/init/Kconfig b/init/Kconfig
index af09b4fb43d2..ba1e6eaf4c36 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -538,15 +538,6 @@ config RCU_STALL_COMMON
 config CONTEXT_TRACKING
        bool
 
-config RCU_USER_QS
-        bool
-        help
-          This option sets hooks on kernel / userspace boundaries and
-          puts RCU in extended quiescent state when the CPU runs in
-          userspace. It means that when a CPU runs in userspace, it is
-          excluded from the global RCU state machine and thus doesn't
-          try to keep the timer tick on for RCU.
-
 config CONTEXT_TRACKING_FORCE
         bool "Force context tracking"
         depends on CONTEXT_TRACKING
@@ -707,6 +698,7 @@ config RCU_BOOST_DELAY
 config RCU_NOCB_CPU
         bool "Offload RCU callback processing from boot-selected CPUs"
         depends on TREE_RCU || PREEMPT_RCU
+        depends on RCU_EXPERT || NO_HZ_FULL
         default n
         help
           Use this option to reduce OS jitter for aggressive HPC or