summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-01-21 06:12:21 +0100
committerIngo Molnar <mingo@kernel.org>2015-01-21 06:12:21 +0100
commitf49028292c13b958fdf4f36c8cc8119d0dde187b (patch)
treeea1f92969a8aca7083f19c4ef07dd3674509554f /mm
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentMerge branches 'doc.2015.01.07a', 'fixes.2015.01.15a', 'preempt.2015.01.06a',... (diff)
downloadlinux-f49028292c13b958fdf4f36c8cc8119d0dde187b.tar.xz
linux-f49028292c13b958fdf4f36c8cc8119d0dde187b.zip
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney: - Documentation updates. - Miscellaneous fixes. - Preemptible-RCU fixes, including fixing an old bug in the interaction of RCU priority boosting and CPU hotplug. - SRCU updates. - RCU CPU stall-warning updates. - RCU torture-test updates. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/Kconfig b/mm/Kconfig
index 1d1ae6b078fd..4395b12869c8 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -325,6 +325,7 @@ config VIRT_TO_BUS
config MMU_NOTIFIER
bool
+ select SRCU
config KSM
bool "Enable KSM for page merging"