diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-21 06:12:21 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-21 06:12:21 +0100 |
| commit | f49028292c13b958fdf4f36c8cc8119d0dde187b (patch) | |
| tree | ea1f92969a8aca7083f19c4ef07dd3674509554f /kernel/rcu/Makefile | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | Merge branches 'doc.2015.01.07a', 'fixes.2015.01.15a', 'preempt.2015.01.06a',... (diff) | |
| download | linux-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 'kernel/rcu/Makefile')
| -rw-r--r-- | kernel/rcu/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/rcu/Makefile b/kernel/rcu/Makefile index e6fae503d1bc..50a808424b06 100644 --- a/kernel/rcu/Makefile +++ b/kernel/rcu/Makefile @@ -1,4 +1,5 @@ -obj-y += update.o srcu.o +obj-y += update.o +obj-$(CONFIG_SRCU) += srcu.o obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_TREE_RCU) += tree.o obj-$(CONFIG_PREEMPT_RCU) += tree.o |