From 217915023d2dae8a2b1fb54534ae1ffbeec74ea7 Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Mon, 4 Jan 2010 16:04:01 -0800
Subject: [PATCH] --- yaml --- r: 182236 b: refs/heads/master c:
 cba8244a0f1c277b6b1e48ed6504fa434119e24d h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/rcutree_plugin.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c48f87e98ca0..589799583dac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9094d8e5587cf21091a9516628147c0b55e4264
+refs/heads/master: cba8244a0f1c277b6b1e48ed6504fa434119e24d
diff --git a/trunk/kernel/rcutree_plugin.h b/trunk/kernel/rcutree_plugin.h
index f11ebd44b454..e77cdf321e13 100644
--- a/trunk/kernel/rcutree_plugin.h
+++ b/trunk/kernel/rcutree_plugin.h
@@ -304,6 +304,9 @@ void __rcu_read_unlock(void)
 	if (--ACCESS_ONCE(t->rcu_read_lock_nesting) == 0 &&
 	    unlikely(ACCESS_ONCE(t->rcu_read_unlock_special)))
 		rcu_read_unlock_special(t);
+#ifdef CONFIG_PROVE_LOCKING
+	WARN_ON_ONCE(ACCESS_ONCE(t->rcu_read_lock_nesting) < 0);
+#endif /* #ifdef CONFIG_PROVE_LOCKING */
 }
 EXPORT_SYMBOL_GPL(__rcu_read_unlock);