---

yaml --- r: 312186 b: refs/heads/master c: e5c1f44 h: refs/heads/master v: v3
git-mirror · Jul 2, 2012 · 42ba3d0 · 42ba3d0
1 parent bdaaca7
commit 42ba3d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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[];