From 10788f63c3449ac28e921e36425b41dd83245ebc Mon Sep 17 00:00:00 2001
From: Josh Triplett <josht@vnet.ibm.com>
Date: Fri, 30 Jun 2006 01:56:05 -0700
Subject: [PATCH] --- yaml --- r: 31406 b: refs/heads/master c:
 7f04ac062e92a37bb0fa3313405597244b4702c1 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/include/linux/rcupdate.h | 24 ++++++++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a54312ce3b20..bc1c0e115459 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7adc28ae75854d9d0940668404a14d1f006f80c0
+refs/heads/master: 7f04ac062e92a37bb0fa3313405597244b4702c1
diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h
index 48dfe00070c7..b4ca73d65891 100644
--- a/trunk/include/linux/rcupdate.h
+++ b/trunk/include/linux/rcupdate.h
@@ -163,14 +163,22 @@ extern int rcu_needs_cpu(int cpu);
  *
  * It is illegal to block while in an RCU read-side critical section.
  */
-#define rcu_read_lock()		preempt_disable()
+#define rcu_read_lock() \
+	do { \
+		preempt_disable(); \
+		__acquire(RCU); \
+	} while(0)
 
 /**
  * rcu_read_unlock - marks the end of an RCU read-side critical section.
  *
  * See rcu_read_lock() for more information.
  */
-#define rcu_read_unlock()	preempt_enable()
+#define rcu_read_unlock() \
+	do { \
+		__release(RCU); \
+		preempt_enable(); \
+	} while(0)
 
 /*
  * So where is rcu_write_lock()?  It does not exist, as there is no
@@ -193,14 +201,22 @@ extern int rcu_needs_cpu(int cpu);
  * can use just rcu_read_lock().
  *
  */
-#define rcu_read_lock_bh()	local_bh_disable()
+#define rcu_read_lock_bh() \
+	do { \
+		local_bh_disable(); \
+		__acquire(RCU_BH); \
+	} while(0)
 
 /*
  * rcu_read_unlock_bh - marks the end of a softirq-only RCU critical section
  *
  * See rcu_read_lock_bh() for more information.
  */
-#define rcu_read_unlock_bh()	local_bh_enable()
+#define rcu_read_unlock_bh() \
+	do { \
+		__release(RCU_BH); \
+		local_bh_enable(); \
+	} while(0)
 
 /**
  * rcu_dereference - fetch an RCU-protected pointer in an