diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-06-30 02:27:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-30 02:27:41 -0400 |
| commit | 54d5f16e55a7cdd64e0f6bcadf2b5f871f94bb83 (patch) | |
| tree | 169537619e16c6a6d802585ba97aae405642233a /init | |
| parent | 4c2e07c6a29e0129e975727b9f57eede813eea85 (diff) | |
| parent | 4d03754f04247bc4d469b78b61cac942df37445d (diff) | |
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:
- Documentation updates. Just some simple changes, no design-level
additions.
- Miscellaneous fixes.
- Torture-test updates.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index f755a602d4a1..a068265fbcaf 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 |