diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-02-26 06:38:59 -0800 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-02-26 06:38:59 -0800 |
| commit | f5604f67fe8cbd6f2088b20b9463f721aa613d4b (patch) | |
| tree | 27b16f4c8415d60c796c24472c29968bc8d39b04 /kernel/rcu/Makefile | |
| parent | 322efba5b6442f331ac8aa24e92a817d804cc938 (diff) | |
| parent | 73fa867e2c705cf5cf0a38df8618fa20eee3d75a (diff) | |
| download | talos-obmc-linux-f5604f67fe8cbd6f2088b20b9463f721aa613d4b.tar.gz talos-obmc-linux-f5604f67fe8cbd6f2088b20b9463f721aa613d4b.zip | |
Merge branch 'torture.2014.02.23a' into HEAD
torture.2014.02.23a: locktorture addition and rcutorture changes
Diffstat (limited to 'kernel/rcu/Makefile')
| -rw-r--r-- | kernel/rcu/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/rcu/Makefile b/kernel/rcu/Makefile index 01e9ec37a3e3..807ccfbf69b3 100644 --- a/kernel/rcu/Makefile +++ b/kernel/rcu/Makefile @@ -1,5 +1,5 @@ obj-y += update.o srcu.o -obj-$(CONFIG_RCU_TORTURE_TEST) += torture.o +obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_TREE_RCU) += tree.o obj-$(CONFIG_TREE_PREEMPT_RCU) += tree.o obj-$(CONFIG_TREE_RCU_TRACE) += tree_trace.o |
