From bdaaca7828f69f598a9c7c9237556e6d77c2c2e9 Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Wed, 16 May 2012 15:42:30 -0700
Subject: [PATCH] --- yaml --- r: 312185 b: refs/heads/master c:
 d1b88eb9e3bccaa43fb5d1bde1cbe210b3434731 h: refs/heads/master i:   312183:
 27c55fed65bc9a61467032ef44e35270004ff239 v: v3

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

diff --git a/[refs] b/[refs]
index 241c13632012..5d30f08f23da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d36cc701b28983ea2c8d80afe68aae5452aea3bf
+refs/heads/master: d1b88eb9e3bccaa43fb5d1bde1cbe210b3434731
diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h
index ffe24c09e53d..abf44d89c6ce 100644
--- a/trunk/include/linux/rcupdate.h
+++ b/trunk/include/linux/rcupdate.h
@@ -903,7 +903,9 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)
  * the reader-accessible portions of the linked structure.
  */
 #define RCU_INIT_POINTER(p, v) \
-		p = (typeof(*v) __force __rcu *)(v)
+	do { \
+		p = (typeof(*v) __force __rcu *)(v); \
+	} while (0)
 
 /**
  * RCU_POINTER_INITIALIZER() - statically initialize an RCU protected pointer