diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-12 12:12:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-12 12:12:12 +0200 |
| commit | 9b9412dc7008f360c8e8ed10a654d3c8719f69d8 (patch) | |
| tree | f70ad5404519008315d576de91eb1d4fb55116d5 /init | |
| parent | 58ccab91342c1cc1fe08da9b198ac5d763706c2e (diff) | |
| parent | 3dbe43f6fba9f2a0e46e371733575a45704c22ab (diff) | |
| download | linux-9b9412dc7008f360c8e8ed10a654d3c8719f69d8.tar.gz linux-9b9412dc7008f360c8e8ed10a654d3c8719f69d8.tar.bz2 linux-9b9412dc7008f360c8e8ed10a654d3c8719f69d8.zip | |
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>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 10 |
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 |