diff options
| author | Linus Torvalds | 2016-07-25 14:04:11 -0500 |
|---|---|---|
| committer | Linus Torvalds | 2016-07-25 14:04:11 -0500 |
| commit | df00ccca7201dcb78847de68538486dbcfa5deba (patch) | |
| tree | 2e572a32d6d19e9be5736b82a62f4c23f6eac2d3 /init/Kconfig | |
| parent | dd9506954539dcedd0294a065ff0976e61386fc6 (diff) | |
| parent | 54d5f16e55a7cdd64e0f6bcadf2b5f871f94bb83 (diff) | |
| download | kernel-df00ccca7201dcb78847de68538486dbcfa5deba.tar.gz kernel-df00ccca7201dcb78847de68538486dbcfa5deba.tar.xz kernel-df00ccca7201dcb78847de68538486dbcfa5deba.zip | |
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RCU updates from Ingo Molnar:
"The main changes in this cycle were:
- documentation updates
- miscellaneous fixes
- minor reorganization of code
- torture-test updates"
* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (30 commits)
rcu: Correctly handle sparse possible cpus
rcu: sysctl: Panic on RCU Stall
rcu: Fix a typo in a comment
rcu: Make call_rcu_tasks() tolerate first call with irqs disabled
rcu: Disable TASKS_RCU for usermode Linux
rcu: No ordering for rcu_assign_pointer() of NULL
rcutorture: Fix error return code in rcu_perf_init()
torture: Inflict default jitter
rcuperf: Don't treat gp_exp mis-setting as a WARN
rcutorture: Drop "-soundhw pcspkr" from x86 boot arguments
rcutorture: Don't specify the cpu type of QEMU on PPC
rcutorture: Make -soundhw a x86 specific option
rcutorture: Use vmlinux as the fallback kernel image
rcutorture/doc: Create initrd using dracut
torture: Stop onoff task if there is only one cpu
torture: Add starvation events to error summary
torture: Break online and offline functions out of torture_onoff()
torture: Forgive lengthy trace dumps and preemption
torture: Remove CONFIG_RCU_TORTURE_TEST_RUNNABLE, simplify code
torture: Simplify code, eliminate RCU_PERF_TEST_RUNNABLE
...
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index c02d89777713..7e0b24f69de9 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -517,6 +517,7 @@ config SRCU | |||
| 517 | config TASKS_RCU | 517 | config TASKS_RCU |
| 518 | bool | 518 | bool |
| 519 | default n | 519 | default n |
| 520 | depends on !UML | ||
| 520 | select SRCU | 521 | select SRCU |
| 521 | help | 522 | help |
| 522 | This option enables a task-based RCU implementation that uses | 523 | This option enables a task-based RCU implementation that uses |