Commit-ID: 4f44728d16710f60ca2360374016d6f5c9672964
Gitweb: http://git.kernel.org/tip/4f44728d16710f60ca2360374016d6f5c9672964
Author: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
AuthorDate: Wed, 23 Sep 2009 16:18:13 -0700
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Thu, 24 Sep 2009 10:50:09 +0200
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@xxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
kernel/rcupdate.c | 7 +++++++
kernel/rcutree.c | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
index babb577..2480534 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) { \
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|