summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2009-09-23 23:18:13 (GMT)
committerIngo Molnar <mingo@elte.hu>2009-10-05 19:01:28 (GMT)
commit162cc2794df37662beb7f97ddd1dd5bffaf85e9a (patch)
tree88619bce8fce70c4f19c1a5809448d7b624bbb9e
parent9b2619aff0332e95ea5eb7a0d75b0208818d871c (diff)
downloadlinux-162cc2794df37662beb7f97ddd1dd5bffaf85e9a.tar.xz
rcu: Fix rcu_lock_map build failure on CONFIG_PROVE_LOCKING=y
Move the rcu_lock_map definition from rcutree.c to rcupdate.c so that TINY_RCU can use lockdep. Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/rcupdate.c7
-rw-r--r--kernel/rcutree.c7
2 files changed, 7 insertions, 7 deletions
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
index 8e79513..4a189ea 100644
--- a/kernel/rcupdate.c
+++ b/kernel/rcupdate.c
@@ -46,6 +46,13 @@
#include <linux/module.h>
#include <linux/kernel_stat.h>
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+static struct lock_class_key rcu_lock_key;
+struct lockdep_map rcu_lock_map =
+ STATIC_LOCKDEP_MAP_INIT("rcu_read_lock", &rcu_lock_key);
+EXPORT_SYMBOL_GPL(rcu_lock_map);
+#endif
+
enum rcu_barrier {
RCU_BARRIER_STD,
RCU_BARRIER_BH,
diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index 8e52cde..81af59b 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -49,13 +49,6 @@
#include "rcutree.h"
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-static struct lock_class_key rcu_lock_key;
-struct lockdep_map rcu_lock_map =
- STATIC_LOCKDEP_MAP_INIT("rcu_read_lock", &rcu_lock_key);
-EXPORT_SYMBOL_GPL(rcu_lock_map);
-#endif
-
/* Data structures. */
#define RCU_STATE_INITIALIZER(name) { \