diff --git a/[refs] b/[refs]
index bccaf2c78017..c2ca6e77ba97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7eb4f4553ceaa6c64da83c8a71d5a991c0188655
+refs/heads/master: d322f45ceed525daa9401154590bbae3222cfefb
diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h
index caf22e84a743..d7accc5f8892 100644
--- a/trunk/include/linux/rcupdate.h
+++ b/trunk/include/linux/rcupdate.h
@@ -443,9 +443,7 @@ extern int rcu_my_thread_group_empty(void);
 	})
 #define __rcu_assign_pointer(p, v, space) \
 	({ \
-		if (!__builtin_constant_p(v) || \
-		    ((v) != NULL)) \
-			smp_wmb(); \
+		smp_wmb(); \
 		(p) = (typeof(*v) __force space *)(v); \
 	})