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 /kernel/time | |
| parent | Merge tag 'localmodconfig-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | Merge branches 'doc.2015.07.15a' and 'torture.2015.07.15a' into HEAD (diff) | |
| download | linux-9b9412dc7008f360c8e8ed10a654d3c8719f69d8.tar.xz 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 'kernel/time')
| -rw-r--r-- | kernel/time/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig index 579ce1b929af..4008d9f95dd7 100644 --- a/kernel/time/Kconfig +++ b/kernel/time/Kconfig @@ -92,12 +92,10 @@ config NO_HZ_FULL depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS # We need at least one periodic CPU for timekeeping depends on SMP - # RCU_USER_QS dependency depends on HAVE_CONTEXT_TRACKING # VIRT_CPU_ACCOUNTING_GEN dependency depends on HAVE_VIRT_CPU_ACCOUNTING_GEN select NO_HZ_COMMON - select RCU_USER_QS select RCU_NOCB_CPU select VIRT_CPU_ACCOUNTING_GEN select IRQ_WORK |