From: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Date: Wed, 23 Sep 2009 23:18:13 +0000 (-0700)
Subject: rcu: Fix rcu_lock_map build failure on CONFIG_PROVE_LOCKING=y
X-Git-Tag: v2.6.32-rc4~24^2~12
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=162cc2794df37662beb7f97ddd1dd5bffaf85e9a;p=safe%2Fjmp%2Flinux-2.6

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>
---

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) { \