From 42ba3d0150ea581201ff03fa7bb89329c3e9eb45 Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Wed, 16 May 2012 16:31:38 -0700
Subject: [PATCH] --- yaml --- r: 312186 b: refs/heads/master c:
 e5c1f444d28b1a9eaf9c3927041db0414f684ef4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5d30f08f23da..e949d9c9f366 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1b88eb9e3bccaa43fb5d1bde1cbe210b3434731
+refs/heads/master: e5c1f444d28b1a9eaf9c3927041db0414f684ef4
diff --git a/trunk/include/linux/key.h b/trunk/include/linux/key.h
index 4cd22ed627ef..cef3b315ba7c 100644
--- a/trunk/include/linux/key.h
+++ b/trunk/include/linux/key.h
@@ -303,7 +303,9 @@ static inline bool key_is_instantiated(const struct key *key)
 				   rwsem_is_locked(&((struct key *)(KEY))->sem)))
 
 #define rcu_assign_keypointer(KEY, PAYLOAD)				\
-	(rcu_assign_pointer((KEY)->payload.rcudata, PAYLOAD))
+do {									\
+	rcu_assign_pointer((KEY)->payload.rcudata, (PAYLOAD));		\
+} while (0)
 
 #ifdef CONFIG_SYSCTL
 extern ctl_table key_sysctls[];