---

yaml --- r: 83440 b: refs/heads/master c: d99c4f6 h: refs/heads/master v: v3
git-mirror · Feb 6, 2008 · 0be0af9 · 0be0af9
1 parent 891af32
commit 0be0af9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba6f867f114760d4e43f0f93abe280ee0a0d696e
+refs/heads/master: d99c4f6b13b3149bc83703ab1493beaeaaaf8a2d
diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h
@@ -174,10 +174,13 @@ struct rcu_head {
  * code.
  */
 
-#define rcu_assign_pointer(p, v)	({ \
-						smp_wmb(); \
-						(p) = (v); \
-					})
+#define rcu_assign_pointer(p, v) \
+	({ \
+		if (!__builtin_constant_p(v) || \
+		    ((v) != NULL)) \
+			smp_wmb(); \
+		(p) = (v); \
+	})
 
 /**
  * synchronize_sched - block until all CPUs have exited any non-preemptive