summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-06-30 08:27:41 +0200
committerIngo Molnar <mingo@kernel.org>2016-06-30 08:27:41 +0200
commit54d5f16e55a7cdd64e0f6bcadf2b5f871f94bb83 (patch)
tree169537619e16c6a6d802585ba97aae405642233a /init
parentLinux 4.7-rc5 (diff)
parentMerge branches 'doc.2016.06.15a', 'fixes.2016.06.15b' and 'torture.2016.06.14... (diff)
downloadlinux-54d5f16e55a7cdd64e0f6bcadf2b5f871f94bb83.tar.xz
linux-54d5f16e55a7cdd64e0f6bcadf2b5f871f94bb83.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: - 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/Kconfig1
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
config TASKS_RCU
bool
default n
+ depends on !UML
select SRCU
help
This option enables a task-based RCU implementation that uses