rcu: No ordering for rcu_assign_pointer() of NULL

[deliverable/linux.git] / include / linux / rcupdate.h

diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index c61b6b9506e7ee9666eb9e48c5e669293e869e0f..a8af79738a0e7910966b19b37e3becd69f960156 100644 (file)
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -650,7 +650,16 @@ static inline void rcu_preempt_sleep_check(void)
  * please be careful when making changes to rcu_assign_pointer() and the
  * other macros that it invokes.
  */
-#define rcu_assign_pointer(p, v) smp_store_release(&p, RCU_INITIALIZER(v))
+#define rcu_assign_pointer(p, v)                                             \
+({                                                                           \
+       uintptr_t _r_a_p__v = (uintptr_t)(v);                                 \
+                                                                             \
+       if (__builtin_constant_p(v) && (_r_a_p__v) == (uintptr_t)NULL)        \
+               WRITE_ONCE((p), (typeof(p))(_r_a_p__v));                      \
+       else                                                                  \
+               smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
+       _r_a_p__v;                                                            \
+})
 
 /**
  * rcu_access_pointer() - fetch RCU pointer with no dereferencing